[tor-commits] [tor/master] Merge branch 'dirauth_config_squashed'

[nickm at torproject.org]

commit a6ba56761b6dc22011eee015f371d37d7b399a64
Merge: 5c98a42f4 13df74492
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 19 07:55:06 2019 -0500

    Merge branch 'dirauth_config_squashed'

 src/app/config/config.c                            |  1 -
 src/app/config/or_options_st.h                     |  2 --
 src/app/main/subsystem_list.c                      |  4 ---
 src/core/include.am                                | 15 +++++++++-
 src/feature/dirauth/.may_include                   |  1 +
 src/feature/dirauth/dirauth_config.c               | 22 +++++++++++++++
 src/feature/dirauth/dirauth_config.h               |  2 ++
 src/feature/dirauth/dirauth_options.inc            | 18 ++++++++++++
 src/feature/dirauth/dirauth_options_st.h           | 22 +++++++++++++++
 src/feature/dirauth/dirauth_stub.c                 | 33 ++++++++++++++++++++++
 src/feature/dirauth/dirauth_sys.c                  | 26 ++++++++++++++++-
 src/feature/dirauth/dirauth_sys.h                  | 11 ++++++--
 src/feature/dirauth/dirvote.c                      |  4 ++-
 src/feature/relay/relay_stub.c                     | 20 +++++++++++++
 src/feature/relay/relay_sys.c                      |  2 +-
 src/feature/relay/relay_sys.h                      | 10 +++++--
 src/lib/conf/confdecl.h                            | 23 +++++++++++++++
 src/lib/conf/conftypes.h                           | 15 ++++++++++
 src/lib/confmgt/confmgt.c                          |  3 ++
 src/lib/confmgt/structvar.c                        | 22 +++++++++++++--
 src/test/conf_examples/dirauth_2/expected          |  1 +
 src/test/conf_examples/dirauth_2/expected_log      |  1 +
 .../dirauth_2/expected_log_no_dirauth              |  1 +
 .../dirauth_2/expected_log_no_dirauth_relay        |  1 +
 .../conf_examples/dirauth_2/expected_no_dirauth    |  0
 .../dirauth_2/expected_no_dirauth_relay            |  0
 src/test/conf_examples/dirauth_2/torrc             |  5 ++++
 27 files changed, 247 insertions(+), 18 deletions(-)