commit f248a4a38ee74663a1223dc2f1d083d50dc1f18d Merge: 8e451c5c7 1168e21b4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-)