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

[dgoulet at torproject.org]

commit 961a0887808cad6ce1308223c0321a39388e67e0
Merge: 8d094f2d2 3d0e1c42d
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Jun 22 14:57:50 2020 -0400

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