commit 89f52f36e0b50c16072ca2d2ebc27cd473609c6e Merge: 23ff60c15 e6b5a1ff9 Author: teor teor@torproject.org Date: Wed Nov 6 21:29:18 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1510'
changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 30 ++++++++++++++++++------------ scripts/git/git-setup-dirs.sh | 6 ++++-- scripts/maint/checkShellScripts.sh | 6 +----- src/test/test_parseconf.sh | 4 ++-- 8 files changed, 33 insertions(+), 23 deletions(-)