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

[dgoulet at torproject.org]

commit 2a524662c3f8a44acd273fd0e60e161cb9a2ed0f
Merge: 80c5c874c 7404b6fb7
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Feb 11 10:52:49 2020 -0500

    Merge branch 'tor-github/pr/1717'

 scripts/git/git-merge-forward.sh | 28 ++++++++++++++--------------
 scripts/git/git-pull-all.sh      | 14 +++++++-------
 scripts/git/git-push-all.sh      | 10 +++++-----
 scripts/git/git-setup-dirs.sh    | 14 +++++++-------
 4 files changed, 33 insertions(+), 33 deletions(-)