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

[nickm at torproject.org]

commit 8bc4822ba60d154956e3def2128d0c4cfb403d16
Merge: 9ca7900e1 3e42004e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 13:45:06 2020 -0400

    Merge branch 'maint-0.4.3'

 src/test/test_options.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)