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

[nickm at torproject.org]

commit 1168e21b45cb981463fa77a45c2e697bb75d573c
Merge: b13bf6506 b548371f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 09:14:12 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23078       |  7 +++++++
 src/or/hs_intropoint.c | 11 ++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)