commit b06997914207c7877f09736bebb9e500019a0555 Merge: 74c767af2 5804ccc90 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 20 12:54:51 2018 -0400

Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3

changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)