aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-04-18 23:32:02 -0400
committerNick Mathewson <nickm@torproject.org>2012-04-18 23:32:02 -0400
commit074bf72a2cb9e641468b9ef92a8b16c7f0e2f00a (patch)
treeb0bd0f43eefc33863b87b8eecfb7929e8a89a828 /src/or/main.c
parente9dae1ff2e147d2b74fb1ce2836fb9c42f227af4 (diff)
downloadtor-074bf72a2cb9e641468b9ef92a8b16c7f0e2f00a.tar.gz
tor-074bf72a2cb9e641468b9ef92a8b16c7f0e2f00a.zip
If DisableNetwork, don't even try to open non-controller listeners
Fix for 5604; bugfix on 0.2.3.9-alpha, which introduced DisableNetwork.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 9022f2eb87..f104b66cd7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1428,7 +1428,7 @@ run_scheduled_events(time_t now)
/** 3d. And every 60 seconds, we relaunch listeners if any died. */
if (!net_is_disabled() && time_to_check_listeners < now) {
- retry_all_listeners(NULL, NULL);
+ retry_all_listeners(NULL, NULL, 0);
time_to_check_listeners = now+60;
}