nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2011-05-17 20:50:18 -04:00
commit 92081f3cdc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug3198 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- When we configure a new bridge via the controller, don't wait up
to ten seconds before trying to fetch its descriptor. Bugfix on
0.2.0.3-alpha; fixes bug 3198 (suggested by 2355).

5
src/or/main.c
View File

@ -1110,8 +1110,6 @@ run_scheduled_events(time_t now)
if (time_to_try_getting_descriptors < now) { if (time_to_try_getting_descriptors < now) {
update_all_descriptor_downloads(now); update_all_descriptor_downloads(now);
update_extrainfo_downloads(now); update_extrainfo_downloads(now);
if (options->UseBridges)
fetch_bridge_descriptors(options, now);
if (router_have_minimum_dir_info()) if (router_have_minimum_dir_info())
time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL;
else else
@ -1124,6 +1122,9 @@ run_scheduled_events(time_t now)
now + DESCRIPTOR_FAILURE_RESET_INTERVAL; 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. */ /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */
if (!last_rotated_x509_certificate) if (!last_rotated_x509_certificate)
last_rotated_x509_certificate = now; last_rotated_x509_certificate = now;