diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-23 11:23:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-23 11:23:00 -0400 |
| commit | 5de91d118ddc3b33bdbed33dbe7fee93f8790c46 (patch) | |
| tree | 98932624c73482b5c45df6073ac33fc223b72b14 | |
| parent | cfd0ee514c279bc6c7b7c299e001693a5aeb1f5f (diff) | |
| parent | 802c063148e7aaf62e9f07ee5043a7451a888b82 (diff) | |
| download | tor-5de91d118ddc3b33bdbed33dbe7fee93f8790c46.tar.gz tor-5de91d118ddc3b33bdbed33dbe7fee93f8790c46.zip | |
Merge branch 'bug11965_v2'
| -rw-r--r-- | changes/bug11965 | 6 | ||||
| -rw-r--r-- | src/or/main.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/changes/bug11965 b/changes/bug11965 new file mode 100644 index 0000000000..a3bfd876b5 --- /dev/null +++ b/changes/bug11965 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Avoid another 60-second delay when starting Tor in a + pluggable-transport-using configuration when we already have + cached descriptors for our bridges. Fixes bug 11965; bugfix on + 0.2.3.6-alpha. diff --git a/src/or/main.c b/src/or/main.c index 1c855d5279..4ac7781cdc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1231,7 +1231,8 @@ run_scheduled_events(time_t now) router_upload_dir_desc_to_dirservers(0); } - if (!options->DisableNetwork && time_to_try_getting_descriptors < now) { + if (!should_delay_dir_fetches(options, NULL) && + time_to_try_getting_descriptors < now) { update_all_descriptor_downloads(now); update_extrainfo_downloads(now); if (router_have_minimum_dir_info()) @@ -1461,7 +1462,8 @@ run_scheduled_events(time_t now) * documents? */ #define networkstatus_dl_check_interval(o) ((o)->TestingTorNetwork ? 1 : 60) - if (time_to_download_networkstatus < now && !options->DisableNetwork) { + if (!should_delay_dir_fetches(options, NULL) && + time_to_download_networkstatus < now) { time_to_download_networkstatus = now + networkstatus_dl_check_interval(options); update_networkstatus_downloads(now); |