commit 923efa3db83870e7c8cf904fd36727725ef23f6d Merge: 75e084389 b548371f7 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 3 09:14:12 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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