[tor-commits] [tor/master] Merge branch 'ticket31241_v3'

[nickm at torproject.org]

commit e7993dc046a099075bc5f9f65a7bb1601686d03c
Merge: 0ae530c8f 63f2a310c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 25 08:10:39 2019 -0400

    Merge branch 'ticket31241_v3'

 changes/ticket31241                       |   5 +
 scripts/maint/practracker/exceptions.txt  |   2 +-
 src/app/config/config.c                   | 190 ++++++----
 src/app/config/config.h                   |  13 +-
 src/app/config/statefile.c                |  47 ++-
 src/feature/dirauth/shared_random_state.c |  32 +-
 src/lib/confmgt/confparse.c               | 112 +++++-
 src/lib/confmgt/confparse.h               |  87 ++++-
 src/test/test_confmgr.c                   | 175 +++++++++
 src/test/test_confparse.c                 |  33 +-
 src/test/test_options.c                   | 604 +++++++++++++++++-------------
 src/test/testing_common.c                 |   1 +
 12 files changed, 872 insertions(+), 429 deletions(-)