[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.3'

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