Nick Mathewson 7a45c9c1d2 Merge remote-tracking branch 'tor-github/pr/1215' %!s(int64=5) %!d(string=hai) anos
..
git-merge-forward.sh 396134188f Stop hard-coding env vars in the git scripts %!s(int64=5) %!d(string=hai) anos
git-pull-all.sh 396134188f Stop hard-coding env vars in the git scripts %!s(int64=5) %!d(string=hai) anos
git-push-all.sh d6202d3128 scripts/git: add TOR_PUSH_DELAY to git-push-all.sh %!s(int64=5) %!d(string=hai) anos
post-merge.git-hook 59e523f058 Early exit from post-merge git hook script when not merging to master %!s(int64=5) %!d(string=hai) anos
pre-commit.git-hook 9abbde2c24 Update pre-commit hook to find checkIncludes in its new location %!s(int64=5) %!d(string=hai) anos
pre-push.git-hook 71e5af0221 pre-push hook: Only run practracker when a special file is present %!s(int64=5) %!d(string=hai) anos