[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/438' into maint-0.3.5

[dgoulet at torproject.org]

commit 488969fe9c4279477b1ff6da34ccf44ed19da8c7
Merge: 95559279e a61473114
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 30 11:43:54 2018 -0400

    Merge branch 'tor-github/pr/438' into 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(-)