commit 00a42277eaa5838e5b7d0b07a53db01780232511 Merge: 483a59ec2 f98f7ca89 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 19 16:30:02 2018 -0500

Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1

changes/bug24895 | 8 ++++++++ src/or/hs_common.c | 17 +++++++++++++++++ src/or/hs_common.h | 1 + src/or/hs_service.c | 1 + src/or/rendservice.c | 10 ++++++++-- 5 files changed, 35 insertions(+), 2 deletions(-)