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

[asn at torproject.org]

commit d6e7fc00f3c3f3d77b0f3257e7bb0d83e35b3e2a
Merge: 1d18ecbc5f cf6e72b702
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 5 10:21:48 2021 +0300

    Merge branch 'maint-0.4.6'

 changes/ticket40378         |  4 ++++
 src/feature/hs/hs_service.c | 18 +++++++++++-------
 src/feature/hs/hs_service.h |  3 ---
 src/test/test_hs_service.c  |  7 -------
 4 files changed, 15 insertions(+), 17 deletions(-)