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

[nickm at torproject.org]

commit aaf0fa6d1177c045a46ad1e5d6321396bf3690cd
Merge: 0bd62c1d9 63ae9ea31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 10:48:31 2017 -0400

    Merge branch 'maint-0.3.1'

 src/test/hs_ntor_ref.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)