diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:01:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:01:39 -0400 |
| commit | 9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 (patch) | |
| tree | e8f51948dfd674724842843d5a23990b5caef0b9 | |
| parent | 3fc0f9efb8b0030bab2574e5998a964adc93ebaa (diff) | |
| parent | db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 (diff) | |
| download | tor-9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8.tar.gz tor-9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8.zip | |
Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
| -rw-r--r-- | changes/bug9229 | 5 | ||||
| -rw-r--r-- | src/or/entrynodes.c | 6 |
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); } } } |