commit 515d4f1e93bcf9160c8b41d5a90b3144388f706f Merge: eb427f309c 0acc3ae879 Author: David Goulet dgoulet@torproject.org Date: Mon Jul 13 15:03:34 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

Makefile.am | 3 +-- changes/ticket40030 | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc Makefile.am index 1a1fa9b658,3b30c01f00..8a26c6403b --- a/Makefile.am +++ b/Makefile.am @@@ -273,13 -271,8 +273,12 @@@ check-local: check-spaces \ check-changes \ check-includes \ + check-best-practices \ - shellcheck \ - check-cocci + 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.'; \