diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-04-10 14:44:38 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-04-10 14:44:38 -0400 |
commit | 386f8016b7373bec346162705671751f07f281d7 (patch) | |
tree | 0eefd550903fc9caac798f5f5c4dd205437e5a66 /src/or/main.c | |
parent | db6902c23530f8d58e999701685e9cbd74b15a82 (diff) | |
download | tor-386f8016b7373bec346162705671751f07f281d7.tar.gz tor-386f8016b7373bec346162705671751f07f281d7.zip |
Fix another crash-on-no-threadpool bug.
This one happens if for some reason you start with DirPort enabled
but server mode turned off entirely.
Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 197dfd4308..e9723cb0b7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2487,7 +2487,7 @@ do_main_loop(void) now = time(NULL); directory_info_has_arrived(now, 1, 0); - if (server_mode(get_options())) { + if (server_mode(get_options()) || dir_server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ cpu_init(); } |