commit b489e8cfeaaf4d66f048e51453873a0357dd2ba3 Merge: b22b60365 4c094436c Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 09:48:03 2018 -0400

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