[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/743'

[nickm at torproject.org]

commit 8fd20df4550773bac22cd858d437a8277fe63386
Merge: df279880f 436e0c8ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 8 10:07:25 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/743'

 scripts/maint/git-merge-forward.sh | 39 ++++++++++++++++++++++++++++++++++++--
 scripts/maint/git-pull-all.sh      | 32 ++++++++++++++++++++++++++-----
 2 files changed, 64 insertions(+), 7 deletions(-)