commit e8f08605570ec0ec2dd5c6b224df7a534a7693c3 Merge: e9bb00d8c 8bba93376 Author: George Kadianakis desnacked@riseup.net Date: Thu Mar 19 13:43:49 2020 +0200

Merge branch 'tor-github/pr/1792'

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