diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-24 08:49:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-24 08:49:24 -0400 |
| commit | d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9 (patch) | |
| tree | 3a30b8aa14b3688fbc980ae54821824b1dd820ac /src/or/main.c | |
| parent | 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e (diff) | |
| parent | e8886340762cbe3be306268dfe0003214b09ac07 (diff) | |
| download | tor-d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9.tar.gz tor-d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
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 036ef1efd4..66b5920980 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2520,7 +2520,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(); } |