r15976@catbus: nickm | 2007-10-20 19:44:47 -0400

 Prioritize fetching descriptors and networkstatus docs over fetching more extrainfo docs.

svn:r12067

diff --git a/ChangeLog b/ChangeLog
index 3e5d3c06310ff22fc41b6baf5bc47fd059d4a7e9..b9df1592cc2b7e55681d3ddfe13a9175d88b2a2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,9 @@ Changes in version 0.2.0.9-alpha - 2007-10-??
   o Minor bugfixes (misc):
     - Make base32_decode() accept upper-case letters.  Bugfix on
       0.2.0.7-alpha.
+    - Don't try to download extrainfo documents when we're trying to
+      fetch enough directory info to build a circuit: having enough
+      info should get priority.
 
   o Minor bugfixes (performance):
     - Base64 decoding was actually showing up on our profile when parsing

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 6526d5f550871ed32840e8e5078012fac06f3b73..1317c6230f7639b3088e76a6018077b3c0659137 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3801,6 +3801,8 @@ update_extrainfo_downloads(time_t now)
     return;
   if (should_delay_dir_fetches(options))
     return;
+  if (!router_have_minimum_dir_info())
+    return;
 
   pending = digestmap_new();
   list_pending_descriptor_downloads(pending, 1);