[tor-commits] [tor/master] Merge branch 'bug26535_032' into maint-0.3.2

[nickm at torproject.org]

commit e6366f787c49bebd5faafa1b6f78c81ab463fd08
Merge: 3c97b148a 3baf3d01c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:00 2018 -0400

    Merge branch 'bug26535_032' into maint-0.3.2

 changes/bug26535.032    | 5 +++++
 src/test/hs_ntor_ref.py | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)