summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-14 09:34:51 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-24 07:49:39 -0500
commit63b7dabdea6c25cba6604af5d9340799636985b3 (patch)
treefe84c023f3a5474fbffd6e9005621632f4772499 /src/app
parent2e5d555c0e4adb5ea4739ec58124f61c46bd20aa (diff)
downloadtor-63b7dabdea6c25cba6604af5d9340799636985b3.tar.gz
tor-63b7dabdea6c25cba6604af5d9340799636985b3.zip
Merge ocirc and orconn events into or subsystem.
Pubsub events are not supposed to have their own subsystems; they're supposed to be part of a parent subsystem.
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main/subsystem_list.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c
index 84c6e6ec0e..06f39df2e6 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"
@@ -61,8 +59,6 @@ const subsys_fns_t *tor_subsystems[] = {
&sys_mainloop,
&sys_or,
- &sys_orconn_event,
- &sys_ocirc_event,
&sys_relay,