commit c63d951e7f093f3a97748f96314b669d0cd1da54 Merge: 51d94cea3 9c90bddc4 Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:28:22 2018 -0500

Merge remote-tracking branch 'tor-github/pr/530'

changes/ticket27993 | 3 ++ scripts/maint/pre-push.git-hook | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)