commit a3b8ba5098e9a3e68b1dc4e6a678b37039b47cdd Merge: 9c151f0433 9b59ede8d3 Author: George Kadianakis desnacked@riseup.net Date: Tue Jan 12 18:05:32 2021 +0200

Merge branch 'maint-0.4.5' into release-0.4.5

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 | 9 ++++-- src/feature/hs_common/shared_random_client.c | 26 ++++++++++------ 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 | 40 ++++++++++++------------ src/test/test_shared_random.c | 22 ++++++++++--- 13 files changed, 144 insertions(+), 89 deletions(-)