mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 13:34:59 +02:00
Merge branch 'maint-0.2.2'
This commit is contained in:
commit
92081f3cdc
4
changes/bug3198
Normal file
4
changes/bug3198
Normal 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).
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user