commit 6891d1bbcb935d186150610a7abd20a2a270ce67 Merge: bdb3be011 ca356b952 Author: George Kadianakis desnacked@riseup.net Date: Thu May 28 12:25:57 2020 +0300

Merge branch 'tor-github/pr/1792' into maint-0.4.3

changes/ticket33458 | 4 +++ src/feature/hs/hs_cache.c | 64 ++++++++++++++++++++++++++++++++++++++--------- src/test/test_hs_client.c | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 12 deletions(-)