[tor-commits] [tor/master] Merge branch 'bug23071_031' into maint-0.3.1

[nickm at torproject.org]

commit a9a8d53dec3badb0176a1eebeaaa9aca04a4feff
Merge: 830b7b31b ee849ee8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 2 12:51:42 2017 -0400

    Merge branch 'bug23071_031' into maint-0.3.1

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