Merge branch 'maint-0.4.3' into maint-0.4.4

diff --cc Makefile.am
index 1a1fa9b6587db9e539632b610dcaade89c90c3f2,3b30c01f00bc59e95886928dd7a831f1a39d5bb1..8a26c6403b3062d574e7cc9090e98e4c2b52f2c5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -273,13 -271,8 +273,12 @@@ 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 .
 +.PHONY: need-chutney-path
  need-chutney-path:
        @if test ! -d "$$CHUTNEY_PATH"; then \
                echo '$$CHUTNEY_PATH was not set.'; \