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

[nickm at torproject.org]

commit 9b060547ce3dec290ce4a02f9aa54d11b0939e0b
Merge: 788c44308 d38e47495
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:03 2018 -0400

    Merge branch 'maint-0.3.4' into release-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(-)