commit 24bc2cd7b5ab32d6a34dee3a27d5d383a383b270 Merge: 6ba05eea8 38c4e1426 Author: David Goulet dgoulet@torproject.org Date: Mon Aug 26 09:38:24 2019 -0400

Merge branch 'tor-github/pr/1254'

changes/ticket30935 | 6 + scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 260 ++++++++++++------------------ src/app/config/config.h | 2 +- src/app/config/confparse.c | 90 ++++++----- src/app/config/confparse.h | 72 ++------- src/app/config/statefile.c | 11 +- src/app/config/testnet.inc | 33 ++++ src/core/include.am | 7 +- src/feature/dirauth/shared_random_state.c | 16 +- src/lib/conf/.may_include | 1 + src/lib/conf/confmacros.h | 67 ++++++++ src/lib/conf/conftesting.h | 86 ++++++++++ src/lib/conf/conftypes.h | 65 ++++---- src/lib/conf/include.am | 4 +- src/lib/confmgt/structvar.c | 37 +++++ src/lib/confmgt/structvar.h | 5 + src/lib/confmgt/type_defs.c | 65 +++++--- src/lib/confmgt/typedvar.c | 45 ++++++ src/lib/confmgt/typedvar.h | 6 + src/lib/confmgt/var_type_def_st.h | 20 +++ src/test/test_confparse.c | 30 ++-- 22 files changed, 582 insertions(+), 348 deletions(-)