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

[nickm at torproject.org]

commit 935fb0dca9191bd9368c5eadf662cf00f101a92d
Merge: dd7838cd6 55cb6c3fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 13 14:15:25 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug33545                 |  4 ++++
 src/feature/control/control_hs.c |  9 ++++++++-
 src/feature/hs/hs_client.c       |  7 +++++++
 src/feature/hs/hs_client.h       |  2 +-
 src/feature/hs/hs_descriptor.c   |  8 ++++++--
 src/test/test_hs_client.c        |  4 ++++
 src/test/test_hs_control.c       | 14 ++++++++++++++
 7 files changed, 44 insertions(+), 4 deletions(-)