commit 9ef97a268b06fed7b07908823600911a2a6eadc1 Merge: 451c852a0 1bc95633f Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 3 10:08:36 2018 -0500 Merge branch 'bug24634' into maint-0.3.2 changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-)