commit cdb065d6b211298efb0be9320fce32d307b79d2c Merge: 6ba7f9f0a 9b72dca95 Author: David Goulet <dgoulet@torproject.org> Date: Tue Oct 30 10:55:10 2018 -0400 Merge branch 'maint-0.3.5' changes/bug28127 | 7 +++++++ src/feature/hs/hs_config.c | 30 +++++++++++++++++++----------- src/feature/hs/hs_service.h | 3 +++ src/test/test_hs_config.c | 16 ++++++++++++++++ 4 files changed, 45 insertions(+), 11 deletions(-)