commit 2c36a02bb148e7331675f65628939dec448a8db1 Merge: cae7387ef b06997914 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 20 12:55:46 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)