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

[dgoulet at torproject.org]

commit 34f3fcef408a91275561e86afc3bd1d2da3b0375
Merge: 46a382065 4bcfa286f
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Sep 4 10:33:49 2019 -0400

    Merge branch 'tor-github/pr/1290'

 changes/ticket31240                       |   5 +
 src/app/config/config.c                   | 157 +++----
 src/app/config/config.h                   |   5 +-
 src/app/config/confparse.c                | 746 +++++++++++++++++++++++-------
 src/app/config/confparse.h                |  86 ++--
 src/app/config/or_options_st.h            |   9 +
 src/app/config/or_state_st.h              |   9 +
 src/app/config/statefile.c                |  43 +-
 src/feature/dirauth/shared_random_state.c |  43 +-
 src/test/fuzz/fuzzing_common.c            |   5 +-
 src/test/include.am                       |   1 +
 src/test/test.c                           |   1 +
 src/test/test.h                           |   1 +
 src/test/test_config.c                    |  92 ++--
 src/test/test_confmgr.c                   | 325 +++++++++++++
 src/test/test_confparse.c                 | 383 ++++++++++-----
 src/test/test_dir_handle_get.c            |   3 +-
 src/test/test_entrynodes.c                |  30 +-
 src/test/test_helpers.c                   |   2 +-
 src/test/test_hs_service.c                |  10 +-
 src/test/test_options.c                   |  14 +-
 src/test/test_pt.c                        |   2 +-
 22 files changed, 1483 insertions(+), 489 deletions(-)