commit 00e150a0e4967f5859f3eecb51fb54104d87335d Merge: d7bbfd0f6 66e76066e Author: Nick Mathewson <nickm@torproject.org> Date: Sat Jun 2 10:33:33 2018 -0700 Merge branch 'bug25939_034_01_squashed' changes/bug25939 | 3 +++ src/or/hs_service.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)