commit c4c5077af2fad107c9fcebdd3a7999da7b8ee904 Merge: 706364238 a9a8d53de Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 2 12:51:46 2017 -0400

Merge branch 'maint-0.3.1'

changes/bug23071 | 5 +++++ src/test/hs_ntor_ref.py | 31 ++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-)