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

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

diff --cc src/feature/hs/hs_cache.c index 0febcfb40e,c1334a7d27..765323df0d --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@@ -17,9 -17,9 +17,10 @@@ #include "feature/hs/hs_common.h" #include "feature/hs/hs_client.h" #include "feature/hs/hs_descriptor.h" + #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/rend/rendcache.h" +#include "feature/stats/rephist.h"

#include "feature/hs/hs_cache.h"