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

[nickm at torproject.org]

commit 42246f8c9aee97d3efb0b437369554a3fa6f6890
Merge: 82effefb6 2cd1c0765
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:50:21 2020 -0400

    Merge branch 'maint-0.4.3'

 src/feature/hs/hs_dos.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)