commit 2591440faa2671b52c290879bb3d426eeeec6380 Merge: 9a402a654 4f762bc41 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 5 07:41:58 2019 -0400

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

Makefile.am | 18 ++--------- changes/ticket30967 | 6 ++++ scripts/git/pre-commit.git-hook | 4 +++ scripts/maint/checkShellScripts.sh | 64 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 16 deletions(-)