summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-30 17:00:36 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-30 17:00:36 -0400
commitfe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 (patch)
tree484e4bc7888e1832a62e99815d1fee3a0d9ddf54 /src/or/main.c
parent37f42c2f5898dedfb043a760b30081a0c39f1cd1 (diff)
parentd7e4777791bbaa93f82b98c2529450794b9e8a3f (diff)
downloadtor-fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335.tar.gz
tor-fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335.zip
Merge branch 'bug5604'
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 8308b3a238..ab537728f2 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;
}