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

[nickm at torproject.org]

commit 13210e93f487d34298ef77f78919b07abf01b2e8
Merge: 619cb682f 3e42004e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 13:45:06 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

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