commit e566f56f9bf082794e0b3a8bb006caae75079283 Merge: 3a12f3c e437e06 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 24 10:10:08 2020 -0400

Merge remote-tracking branch 'tor-github/pr/76'

scripts/git/pre-commit.git-hook | 5 +++-- tests/shellcheck-tests.sh | 4 ++-- tests/unit-tests.sh | 4 ++-- tools/bootstrap-network.sh | 3 +++ tools/diagnostics.sh | 3 +++ tools/hsaddress.sh | 3 +++ tools/test-network-impl.sh | 3 +++ tools/test-network.sh | 3 +++ tools/warnings.sh | 3 +++ 9 files changed, 25 insertions(+), 6 deletions(-)