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

[nickm at torproject.org]

commit 3938692f3280355f6f8d9b43ed5ac5b9c93bb48f
Merge: 4872c28af a9a8d53de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 2 12:51:46 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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