commit 5c89197c9f197f39d18872e508635cd4864566aa Merge: 6186288eb6 0485c7ddba Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:11:33 2021 -0500
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +- src/feature/hs/hs_cache.c | 5 ++- src/feature/hs/hs_client.c | 8 +++-- src/feature/hs/hs_common.c | 12 ++++++-- src/feature/hs/hs_service.c | 7 +++-- src/feature/hs_common/shared_random_client.c | 23 +++++++++----- src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 19 ++++++------ src/test/test_hs_client.c | 46 +++++++++++++++------------- src/test/test_hs_common.c | 36 ++++++++++++++-------- src/test/test_hs_service.c | 21 +++++++------ src/test/test_shared_random.c | 22 ++++++++++--- 13 files changed, 133 insertions(+), 76 deletions(-)