[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit d38e474950ab41ad3593dc94de9a240f02938679
Merge: cd2be4283 4c094436c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:03 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug26535.029    | 5 +++++
 changes/bug26535.032    | 5 +++++
 src/test/hs_ntor_ref.py | 7 +++++--
 src/test/ntor_ref.py    | 9 ++++++---
 4 files changed, 21 insertions(+), 5 deletions(-)