commit 033f8044292b74e6a46a719476b9633e5d79d978 Merge: 48ff6a41a 3d0e1c42d Author: David Goulet <dgoulet@torproject.org> Date: Mon Jun 22 14:57:50 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket40005 | 3 +++ src/feature/control/control_hs.c | 3 ++- src/test/test_hs_control.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)