commit e2ddc8b547847164f958938725f65ac491959e32 Merge: 5bf84b1f0 7f3dc8327 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 21 14:39:04 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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