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

changes/bug9229

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

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