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

Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-23 11:01:39 -04:00
commit 9e44df2c98
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug9229 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Avoid 60-second delays in the bootstrapping process when Tor
is launching for a second time while using bridges. Fixes bug 9229;
bugfix on 0.2.0.3-alpha.

6
src/or/entrynodes.c
View File

@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
* our entry node list */ * our entry node list */
entry_guard_register_connect_status(ri->cache_info.identity_digest, entry_guard_register_connect_status(ri->cache_info.identity_digest,
1, 0, now); 1, 0, now);
if (first) if (first) {
/* XXXX apparently, this is never called. See bug #9229. */
routerlist_retry_directory_downloads(now); routerlist_retry_directory_downloads(now);
}
update_networkstatus_downloads(now);
} }
} }
} }