commit afd88ee87fa27fd7f9d9f63222ac472cdd975f68 Merge: 04926126ee fcf4954cc8 Author: George Kadianakis desnacked@riseup.net Date: Wed Aug 5 14:57:20 2020 +0300

Merge remote-tracking branch 'tor-gitlab/mr/88'

changes/bug40062 | 6 ++++ src/feature/hs/hs_service.c | 2 +- src/feature/relay/router.c | 17 ++++------ src/feature/rend/rendservice.c | 2 +- src/lib/fs/files.c | 20 ++++++++++++ src/lib/fs/files.h | 2 ++ src/test/test_util.c | 72 +++++++++++++++++++++++++++++++++++++++--- 7 files changed, 103 insertions(+), 18 deletions(-)