From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Mar 2014 19:01:27 +0000 (-0400)
Subject: Update ns downloads when we receive a bridge descriptor
X-Git-Tag: tor-0.2.4.22~12^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04;p=thirdparty%2Ftor.git

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.
---

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);
     }
   }
 }