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

[nickm at torproject.org]

commit 5df265ae55f8e7b056a34b1a9006c73a584cbe80
Merge: 2db94810b dc5c9af6c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 22 09:09:17 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23610       | 4 ++++
 src/or/hs_intropoint.c | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)