commit bf4f55a13da783083b0c76decd6ebf475a63ebd0 Merge: 5d73f87ce 60d108123 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 15:01:49 2018 -0500

Merge branch 'subsystems'

.gitignore | 2 + Makefile.am | 2 + changes/subsystems | 6 + src/app/config/config.c | 46 +------ src/app/config/config.h | 2 - src/app/config/statefile.c | 1 + src/app/main/main.c | 82 ++---------- src/app/main/subsysmgr.c | 202 ++++++++++++++++++++++++++++++ src/app/main/subsysmgr.h | 24 ++++ src/app/main/subsystem_list.c | 40 ++++++ src/core/include.am | 3 + src/feature/control/control.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/feature/relay/router.c | 1 + src/include.am | 2 + src/lib/compress/.may_include | 1 + src/lib/compress/compress.c | 21 +++- src/lib/compress/compress.h | 2 +- src/lib/compress/compress_sys.h | 14 +++ src/lib/compress/include.am | 1 + src/lib/crypt_ops/.may_include | 1 + src/lib/crypt_ops/crypto_init.c | 47 +++++++ src/lib/crypt_ops/crypto_sys.h | 14 +++ src/lib/crypt_ops/include.am | 1 + src/lib/err/.may_include | 2 + src/lib/err/include.am | 8 +- src/lib/err/torerr.c | 10 ++ src/lib/err/torerr.h | 1 + src/lib/err/torerr_sys.c | 40 ++++++ src/lib/err/torerr_sys.h | 14 +++ src/lib/log/.may_include | 4 +- src/lib/log/include.am | 10 +- src/lib/log/log.c | 3 +- src/lib/log/log_sys.c | 35 ++++++ src/lib/log/log_sys.h | 14 +++ src/lib/net/.may_include | 1 + src/lib/net/include.am | 2 + src/lib/net/network_sys.c | 44 +++++++ src/lib/net/network_sys.h | 14 +++ src/lib/process/.may_include | 1 + src/lib/process/include.am | 6 +- src/lib/process/winprocess_sys.c | 64 ++++++++++ src/lib/process/winprocess_sys.h | 14 +++ src/lib/subsys/.may_include | 1 + src/lib/subsys/include.am | 3 + src/lib/subsys/subsys.h | 95 ++++++++++++++ src/lib/thread/.may_include | 1 + src/lib/thread/compat_threads.c | 16 +++ src/lib/thread/include.am | 5 +- src/lib/thread/thread_sys.h | 14 +++ src/lib/time/.may_include | 1 + src/lib/time/include.am | 2 + src/lib/time/time_sys.c | 26 ++++ src/lib/time/time_sys.h | 14 +++ src/lib/tls/.may_include | 1 + src/lib/tls/include.am | 1 + src/lib/tls/tortls.c | 14 +++ src/lib/tls/tortls_sys.h | 14 +++ src/lib/version/.may_include | 3 + src/lib/{log => version}/git_revision.c | 2 +- src/lib/{log => version}/git_revision.h | 0 src/lib/version/include.am | 25 ++++ src/lib/version/torversion.h | 12 ++ src/lib/version/version.c | 50 ++++++++ src/lib/wallclock/.may_include | 1 + src/lib/wallclock/approx_time.c | 16 +++ src/lib/wallclock/include.am | 3 +- src/lib/wallclock/wallclock_sys.h | 14 +++ src/rust/build.rs | 1 + src/test/bench.c | 7 +- src/test/fuzz/fuzzing_common.c | 10 +- src/test/testing_common.c | 20 +-- 72 files changed, 1013 insertions(+), 163 deletions(-)

diff --cc src/lib/thread/.may_include index fc56f4683,c26a42692..02711348c --- a/src/lib/thread/.may_include +++ b/src/lib/thread/.may_include @@@ -2,6 -2,6 +2,7 @@@ orconfig. lib/cc/*.h lib/lock/*.h lib/log/*.h + lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h +lib/wallclock/*.h