[tor-commits] [tor/master] Merge branch 'bug30286_2_squashed'

[nickm at torproject.org]

commit 0c16ec4c0775db4a91a99cb935d2528233deafb2
Merge: 8cb6b2b9a e8aab46a3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 08:32:39 2019 -0400

    Merge branch 'bug30286_2_squashed'

 changes/bug30286              |  4 ++++
 scripts/git/pre-push.git-hook | 33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 10 deletions(-)