diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-24 07:49:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-24 07:49:45 -0500 |
| commit | d4d5d9d1d1dec69aa51c0b8f5040599c95d7f6f0 (patch) | |
| tree | 7ba97e51cdfa1c6dc138105f0072eca780ac6d92 /src/app/main | |
| parent | caa392a73ad6c8e215a4686955c9de98eeb07661 (diff) | |
| parent | 0c18c94bb1efd9db42748f942117e19e058d3410 (diff) | |
| download | tor-d4d5d9d1d1dec69aa51c0b8f5040599c95d7f6f0.tar.gz tor-d4d5d9d1d1dec69aa51c0b8f5040599c95d7f6f0.zip | |
Merge branch 'ticket33316_squashed'
Diffstat (limited to 'src/app/main')
| -rw-r--r-- | src/app/main/subsystem_list.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index b4439cdc7b..e32083537f 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -14,9 +14,7 @@ #include "lib/cc/torint.h" #include "core/mainloop/mainloop_sys.h" -#include "core/or/ocirc_event_sys.h" #include "core/or/or_sys.h" -#include "core/or/orconn_event_sys.h" #include "feature/control/btrack_sys.h" #include "lib/compress/compress_sys.h" #include "lib/crypt_ops/crypto_sys.h" @@ -24,7 +22,7 @@ #include "lib/log/log_sys.h" #include "lib/net/network_sys.h" #include "lib/process/process_sys.h" -#include "lib/process/winprocess_sys.h" +#include "lib/llharden/winprocess_sys.h" #include "lib/thread/thread_sys.h" #include "lib/time/time_sys.h" #include "lib/tls/tortls_sys.h" @@ -46,28 +44,26 @@ const subsys_fns_t *tor_subsystems[] = { &sys_torerr, &sys_wallclock, - &sys_threads, &sys_logging, + &sys_threads, &sys_time, - &sys_network, - &sys_compress, &sys_crypto, + &sys_compress, + &sys_network, &sys_tortls, - &sys_process, - - &sys_orconn_event, - &sys_ocirc_event, - &sys_btrack, &sys_evloop, + &sys_process, &sys_mainloop, &sys_or, &sys_relay, + &sys_btrack, + &sys_dirauth, }; |