[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[teor at torproject.org]

commit 3d7433cd97d334859d202ce259ae32bc025cc9a7
Merge: cf56693f1 c3a1e15a5
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 21:30:39 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 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        | 21 +++++++++++----------
 scripts/maint/checkShellScripts.sh |  6 +-----
 6 files changed, 20 insertions(+), 17 deletions(-)