diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-10-14 13:33:36 -0400 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 22:48:26 -0700 |
commit | 472b62bfe4edb2f5e332c997be2ec69bdf590660 (patch) | |
tree | 4bef53d6d49e428edfdbdf2c7699a062feb48c5f /src/or/main.c | |
parent | 85ee5b3095f60052412a0bbb1ef0a4ccd5b7c97e (diff) | |
download | tor-472b62bfe4edb2f5e332c997be2ec69bdf590660.tar.gz tor-472b62bfe4edb2f5e332c997be2ec69bdf590660.zip |
Uglify scheduler init logic to avoid crash on startup.
Otherwise, when we authority try to do a self-test because of
init-keys, if that self-test can't be launched for whatever reason and
so we close the channel immediately, we crash.
Yes, this a silly way for initialization to work.
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/or/main.c b/src/or/main.c index 1a2cfad255..7b38f45b22 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2456,14 +2456,6 @@ tor_init(int argc, char *argv[]) log_warn(LD_NET, "Problem initializing libevent RNG."); } - /* - * Initialize the scheduler - this has to come after - * options_init_from_torrc() sets up libevent - why yes, that seems - * completely sensible to hide the libevent setup in the option parsing - * code! - */ - scheduler_init(); - return 0; } |