commit 8d8a9d7f1d9cc779036441cfa9639f35c20e37c9 Merge: 43f4324e2 f6943d702 Author: George Kadianakis desnacked@riseup.net Date: Wed May 27 15:17:55 2020 +0300

Merge branch 'tor-github/pr/1898'

changes/ticket24844 | 4 ++++ src/app/main/main.c | 1 + src/feature/hs/hs_service.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/feature/hs/hs_service.h | 2 ++ 4 files changed, 51 insertions(+)