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

[asn at torproject.org]

commit 36203e88949c6928d2bdb4bffe8b5e7e68657ee9
Merge: 4e3f55fba1 6e37086f85
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Aug 20 14:34:56 2020 +0300

    Merge branch 'maint-0.4.4'

 changes/ticket40089              |  4 ++++
 src/feature/control/control_hs.c | 11 ++++++++++
 src/feature/hs/hs_client.c       |  2 ++
 src/feature/hs/hs_client.h       |  3 +++
 src/test/test_hs_control.c       | 47 +++++++++++++++++++++++++++++++++++++---
 5 files changed, 64 insertions(+), 3 deletions(-)