commit 29a474294c968218576ec6d912a94b8187a1e47b
Merge: 02cff32d79 515d4f1e93
Author: David Goulet <dgou...@torproject.org>
Date: Mon Jul 13 15:04:13 2020 -0400
Merge branch 'maint-0.4.4'
Makefile.am | 3 +--
changes/ticket40030 | 7 +++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --cc Makefile.am
index 711d2cc037,8a26c6403b..4b708af9e5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -273,8 -273,8 +273,7 @@@ check-local:
check-spaces \
check-changes \
check-includes \
- shellcheck \
- check-cocci
- check-best-practices \
+ shellcheck
# test-network requires a copy of Chutney in $CHUTNEY_PATH.
# Chutney can be cloned from https://git.torproject.org/chutney.git .
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
