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

[nickm at torproject.org]

commit b0459de217cdc18d20754ad1495ed1da52885c81
Merge: a7599c5be 0c78811ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 23 12:51:44 2019 -0400

    Merge branch 'ticket30051_take2_squashed'

 changes/ticket30051             | 5 +++++
 scripts/git/pre-commit.git-hook | 4 ++++
 scripts/git/pre-push.git-hook   | 6 ++++++
 3 files changed, 15 insertions(+)