commit 755f0016009424935f3b9216cad79d54129614cc Merge: 99809834a 7c1b2fceb Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 9 16:29:46 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1401'

changes/bug31652 | 5 +++ src/feature/hs/hs_service.c | 87 +++++++++++++++++++++++++++++++++------------ src/test/test_hs_service.c | 6 ++++ 3 files changed, 75 insertions(+), 23 deletions(-)