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

[dgoulet at torproject.org]

commit ef2dd1ba967eb457c3ace590e4a00d14cb6cf854
Merge: 2fce1274d 3e34840a7
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 23 09:46:29 2019 -0400

    Merge branch 'tor-github/pr/1116'

 .gitignore                        |   2 +
 Makefile.am                       |   2 +
 changes/ticket30864               |   3 +
 scripts/maint/add_c_file.py       |   6 +-
 scripts/maint/checkSpace.pl       |   2 +-
 src/app/config/confparse.c        | 543 ++--------------------------
 src/app/config/confparse.h        |  65 +---
 src/include.am                    |   2 +
 src/lib/conf/.may_include         |   2 +
 src/lib/conf/conftypes.h          |  99 ++++++
 src/lib/conf/include.am           |   4 +
 src/lib/confmgt/.may_include      |   9 +
 src/lib/confmgt/include.am        |  23 ++
 src/lib/confmgt/type_defs.c       | 727 ++++++++++++++++++++++++++++++++++++++
 src/lib/confmgt/type_defs.h       |  17 +
 src/lib/confmgt/typedvar.c        | 305 ++++++++++++++++
 src/lib/confmgt/typedvar.h        |  49 +++
 src/lib/confmgt/unitparse.c       | 206 +++++++++++
 src/lib/confmgt/unitparse.h       |  34 ++
 src/lib/confmgt/var_type_def_st.h | 147 ++++++++
 src/lib/encoding/confline.c       |   2 +-
 src/lib/encoding/confline.h       |   2 +-
 src/test/test_confparse.c         |  66 +++-
 src/test/test_options.c           |  12 +-
 24 files changed, 1739 insertions(+), 590 deletions(-)