commit f6c9ca3a1d1c29a293915612e26cdbfeb050c192 Merge: 582cee723 de7053b89 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 7 08:59:42 2019 -0500
Merge branch 'config_subsys_v4'
Doxyfile.in | 10 +- changes/ticket32382 | 4 + changes/ticket32406 | 4 + doc/tor.1.txt | 3 + src/app/config/config.c | 14 +- src/app/config/or_options_st.h | 4 - src/app/config/or_state_st.h | 7 - src/app/config/statefile.c | 15 +- src/app/config/statefile.h | 2 + src/app/main/main.c | 10 - src/app/main/subsysmgr.c | 226 ++++++++++++++++++++- src/app/main/subsysmgr.h | 17 ++ src/core/include.am | 2 + src/core/mainloop/.may_include | 4 +- src/core/mainloop/mainloop_state.inc | 19 ++ src/core/mainloop/mainloop_state_st.h | 23 +++ src/core/mainloop/mainloop_sys.c | 52 +++++ src/core/mainloop/netstatus.c | 5 +- src/core/mainloop/netstatus.h | 7 +- src/feature/dirauth/shared_random_state.c | 1 - src/feature/nodelist/routerset.h | 1 + src/feature/relay/router.c | 9 - src/lib/cc/include.am | 1 + src/lib/cc/tokpaste.h | 30 +++ src/lib/conf/confdecl.h | 197 ++++++++++++++++++ src/lib/conf/conftypes.h | 10 +- src/lib/conf/include.am | 1 + src/lib/confmgt/confmgt.c | 13 +- src/lib/confmgt/confmgt.h | 9 +- src/lib/confmgt/type_defs.c | 121 +++++++---- src/lib/crypt_ops/.may_include | 3 + src/lib/crypt_ops/crypto_init.c | 66 ++++++ src/lib/crypt_ops/crypto_openssl_mgt.c | 28 ++- src/lib/crypt_ops/crypto_options.inc | 19 ++ src/lib/crypt_ops/crypto_options_st.h | 23 +++ src/lib/crypt_ops/include.am | 2 + src/lib/subsys/subsys.h | 42 ++++ src/test/conf_examples/crypto_accel/expected | 2 + src/test/conf_examples/crypto_accel/torrc | 3 + src/test/conf_examples/crypto_accel_req/error | 1 + .../conf_examples/crypto_accel_req/expected_nss | 2 + src/test/conf_examples/crypto_accel_req/torrc | 3 + src/test/test_confmgr.c | 3 +- src/test/test_confparse.c | 2 - src/test/test_mainloop.c | 20 +- src/test/test_options.c | 17 +- 46 files changed, 925 insertions(+), 132 deletions(-)