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

[dgoulet at torproject.org]

commit aba31e2187808257b250bf469895330f273d7746
Merge: f10e6b723 cda10a2e8
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Jan 27 12:04:25 2020 -0500

    Merge branch 'tor-github/pr/1683'

 scripts/git/pre-commit.git-hook | 27 +++++++++------------------
 scripts/git/pre-push.git-hook   | 25 +++++++------------------
 2 files changed, 16 insertions(+), 36 deletions(-)