aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-10 15:01:27 -0400
committerNick Mathewson <nickm@torproject.org>2014-03-10 15:01:27 -0400
commitdb72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 (patch)
treeb811ee202cffb78d6afcae0475810bf53e9ab41e
parentcbf9e742368158b927249913b395b3796d847a92 (diff)
downloadtor-db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04.tar.gz
tor-db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04.zip
Update ns downloads when we receive a bridge descriptor
This prevents long stalls when we're starting with a state file but with no bridge descriptors. Fixes bug 9229. I believe this bug has been present since 0.2.0.3-alpha.
-rw-r--r--changes/bug92295
-rw-r--r--src/or/entrynodes.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/changes/bug9229 b/changes/bug9229
new file mode 100644
index 0000000000..ad7fd22c28
--- /dev/null
+++ b/changes/bug9229
@@ -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.
+
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 2aa063cda4..59770fa658 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
* our entry node list */
entry_guard_register_connect_status(ri->cache_info.identity_digest,
1, 0, now);
- if (first)
+ if (first) {
+ /* XXXX apparently, this is never called. See bug #9229. */
routerlist_retry_directory_downloads(now);
+ }
+
+ update_networkstatus_downloads(now);
}
}
}