[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 13fd8f362fe34a68466c1320329c924f6fefaa45
Merge: 792151e4f4 8c29729916
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Apr 23 13:00:23 2021 +0300

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40356       |  3 +++
 src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 25 deletions(-)