[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

[asn at torproject.org]

commit 973fcf056a21087157e2f07ac94899521b50e1d4
Merge: fe9bd6bd96 f0260c4cea
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Apr 23 13:00:24 2021 +0300

    Merge branch 'maint-0.4.6'

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