commit 55cb6c3fcdbeac31a88bcc62c0dbe5ded4605176 Merge: bfea7a732 f2f718bca Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 13 14:13:44 2020 -0400

Merge branch 'bug33545_043_squashed' into maint-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(-)