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

[dgoulet@xxxxxxxxxxxxxx]

commit 41261c3b5cd505f5a601c319eb484866903814af
Merge: 049705fc1 478141e61
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Sep 11 09:42:31 2019 -0400

    Merge branch 'tor-github/pr/1296'

 changes/ticket31625               |   4 ++
 src/app/config/config.c           |  13 +++-
 src/app/config/confparse.c        | 124 +++++++++++++++++++++++++++++++-------
 src/app/config/confparse.h        |   5 +-
 src/lib/conf/confmacros.h         |   2 +-
 src/lib/conf/conftypes.h          |  58 ++++++++++++++----
 src/lib/confmgt/structvar.c       |  23 ++-----
 src/lib/confmgt/structvar.h       |   5 +-
 src/lib/confmgt/type_defs.c       |  22 ++++---
 src/lib/confmgt/typedvar.c        |  29 ---------
 src/lib/confmgt/typedvar.h        |   4 --
 src/lib/confmgt/var_type_def_st.h |  16 ++---
 src/test/include.am               |   6 +-
 src/test/test_cmdline.sh          |  48 +++++++++++++++
 src/test/test_config.c            |  26 ++++++++
 15 files changed, 269 insertions(+), 116 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits