[tor-commits] [tor/master] Merge branch 'tor-github/pr/1633'

[dgoulet at torproject.org]

commit b958529dbfbacbf8c17ab9fd761fe773125f4572
Merge: 08bbb6b8d 52bbc7fb4
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 14 14:03:21 2020 -0500

    Merge branch 'tor-github/pr/1633'

 changes/ticket32772              |  4 ++++
 scripts/git/git-merge-forward.sh | 21 ++++++---------------
 scripts/git/git-pull-all.sh      |  7 -------
 scripts/git/git-push-all.sh      |  9 +--------
 scripts/git/git-setup-dirs.sh    |  7 -------
 5 files changed, 11 insertions(+), 37 deletions(-)