diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-05-17 20:50:18 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-05-17 20:50:18 -0400 |
| commit | 92081f3cdc2e91f7eb9954af2b647ab0bc65d047 (patch) | |
| tree | fdd17deba23245a080268096997ddfe65144b854 /src | |
| parent | c240efab86d71d8953a36e0599bfc789ee980b71 (diff) | |
| parent | 07c5026efa4c5fac64e5f3e843eae6bea0de54db (diff) | |
| download | tor-92081f3cdc2e91f7eb9954af2b647ab0bc65d047.tar.gz tor-92081f3cdc2e91f7eb9954af2b647ab0bc65d047.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 389ddbdf19..1554e812cf 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1110,8 +1110,6 @@ run_scheduled_events(time_t now) if (time_to_try_getting_descriptors < now) { update_all_descriptor_downloads(now); update_extrainfo_downloads(now); - if (options->UseBridges) - fetch_bridge_descriptors(options, now); if (router_have_minimum_dir_info()) time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; else @@ -1124,6 +1122,9 @@ run_scheduled_events(time_t now) now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } + if (options->UseBridges) + fetch_bridge_descriptors(options, now); + /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */ if (!last_rotated_x509_certificate) last_rotated_x509_certificate = now; |