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

[nickm at torproject.org]

commit 93ca08d66c329eef9691afe6292b2e15246f5510
Merge: 52d386c9b 86478be50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 17 08:56:13 2019 -0400

    Merge branch 'ticket29533_squashed'

 Makefile.am                   | 11 ++++++++++-
 changes/ticket29533           |  3 +++
 scripts/git/pre-push.git-hook |  1 -
 3 files changed, 13 insertions(+), 2 deletions(-)