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

[nickm at torproject.org]

commit 7177eeddf1df90a28d8f733d551ed1198e1fadb1
Merge: 686494f0f 87e087305
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 5 08:48:40 2020 -0500

    Merge branch 'maint-0.4.3'

 changes/ticket33460         |  4 +++
 src/lib/confmgt/type_defs.c | 67 +++++++++++++++++++++++++++++++++------------
 src/lib/confmgt/typedvar.c  | 11 +++++++-
 src/lib/confmgt/unitparse.c | 45 +++++++++++++++++++++---------
 src/lib/confmgt/unitparse.h |  3 +-
 src/test/test_options.c     | 20 +++++---------
 6 files changed, 105 insertions(+), 45 deletions(-)