commit c36c6b50575cc0db94e6e770f5b4d437c851ff59 Merge: 0b49cacd63 dd5fbc1bd9 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:14:10 2021 -0500

Merge branch 'maint-0.4.3' into release-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(-)