commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 3 09:12:23 2017 -0400

Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

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