[tor-commits] [tor/master] Merge branch 'tor-github/pr/1244'

[dgoulet at torproject.org]

commit d475d7c2fb3c0ed5120c50011b187f6957a4f52c
Merge: cc48eff2d edf5a327c
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 22 17:10:22 2019 -0400

    Merge branch 'tor-github/pr/1244'

 changes/ticket30914                       |   4 +
 scripts/maint/practracker/exceptions.txt  |   4 +-
 src/app/config/config.c                   | 138 +++++++++---------
 src/app/config/confparse.c                | 178 ++++++++++-------------
 src/app/config/confparse.h                |  25 ++--
 src/app/config/statefile.c                |  20 ++-
 src/feature/dirauth/shared_random_state.c |  23 +--
 src/feature/nodelist/routerset.c          |  62 ++++++++
 src/feature/nodelist/routerset.h          |   3 +
 src/lib/conf/conftypes.h                  |  40 ++++++
 src/lib/confmgt/include.am                |   2 +
 src/lib/confmgt/structvar.c               | 226 ++++++++++++++++++++++++++++++
 src/lib/confmgt/structvar.h               |  54 +++++++
 src/lib/confmgt/typedvar.c                |  18 +--
 src/test/test_confparse.c                 |  59 ++++++--
 15 files changed, 634 insertions(+), 222 deletions(-)