diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-29 00:38:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-29 00:38:44 -0400 |
| commit | 703eb087f597fa3456627e47862038a4ce73089e (patch) | |
| tree | fd76a2e43a360cd3103252a9459c178d5ba1bc84 /src/or/main.c | |
| parent | f3e8bc391a681ee5e0db1c0cd3796e901ea49846 (diff) | |
| parent | a58610a87e27e446b347f49e847da1cd460ffa81 (diff) | |
| download | tor-703eb087f597fa3456627e47862038a4ce73089e.tar.gz tor-703eb087f597fa3456627e47862038a4ce73089e.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 8ea1728fb7..23daf13661 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -861,7 +861,7 @@ directory_info_has_arrived(time_t now, int from_cache) /* if we have enough dir info, then update our guard status with * whatever we just learned. */ - entry_guards_compute_status(); + entry_guards_compute_status(options, now); /* Don't even bother trying to get extrainfo until the rest of our * directory info is up-to-date */ if (options->DownloadExtraInfo) @@ -1067,7 +1067,7 @@ run_scheduled_events(time_t now) update_extrainfo_downloads(now); update_microdesc_downloads(now); if (options->UseBridges) - fetch_bridge_descriptors(now); + fetch_bridge_descriptors(options, now); if (router_have_minimum_dir_info()) time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; else @@ -1328,7 +1328,7 @@ run_scheduled_events(time_t now) circuit_expire_old_circuits_serverside(now); /** 5. We do housekeeping for each connection... */ - connection_or_set_bad_connections(); + connection_or_set_bad_connections(NULL, 0); for (i=0;i<smartlist_len(connection_array);i++) { run_connection_housekeeping(i, now); } |