commit db2e916afe34c2b2fd3078a0cd4f8e5ba7193904 Merge: f1890707c 7f0516022 Author: David Goulet dgoulet@torproject.org Date: Tue Mar 5 14:26:59 2019 -0500

Merge branch 'tor-github/pr/717'

changes/feature29532 | 4 ++++ scripts/maint/pre-push.git-hook | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 10 deletions(-)