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

[nickm at torproject.org]

commit 9b2e0604a92aa319b78f3c22227a395b83698ab0
Merge: bc493ce0f 99d957696
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 12 08:34:17 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1726/head'

 changes/bug33284              | 4 ++++
 scripts/git/pre-push.git-hook | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)