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

[nickm at torproject.org]

commit 4c094436c50a489d2ecdd09b8dfb7dc9a3c97389
Merge: 9aeef05f8 a4e8f9450
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:03 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 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(-)