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

[nickm at torproject.org]

commit 6babe51571295bf093733003dfd6f57ea9485703
Merge: 564408663 bc4c89eb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 11:53:24 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 src/test/test_hs_control.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)