commit 83424cb62f19ee09cba769a6c9a8cc94fc3c4cb7 Merge: f9812ee5f 984a28f3e Author: teor teor@torproject.org Date: Mon Nov 25 12:33:14 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5

changes/ticket31548 | 7 +++++++ src/feature/hs/hs_service.c | 9 +++++++++ 2 files changed, 16 insertions(+)