commit aa1ae1343a2e57dc5a7bcd045566a10175acdd10 Merge: 124c43704 488969fe9 Author: David Goulet dgoulet@torproject.org Date: Tue Oct 30 11:44:14 2018 -0400

Merge branch 'maint-0.3.5'

changes/ticket27838 | 4 ++ src/feature/hs/hs_service.c | 134 ++++++++++++++++++++++++++++---------------- src/feature/hs/hs_service.h | 72 +++++++++++++++--------- src/test/test_hs_service.c | 4 +- 4 files changed, 135 insertions(+), 79 deletions(-)