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

[nickm at torproject.org]

commit 228d25ddf641f02a38e1cd6386d7e603b9478a9d
Merge: a9628c0c0 d38e47495
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:03 2018 -0400

    Merge branch '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(-)