[or-cvs] r12067: Prioritize fetching descriptors and networkstatus docs over (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-20 19:45:07 -0400 (Sat, 20 Oct 2007)
New Revision: 12067

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
 r15976 at catbus:  nickm | 2007-10-20 19:44:47 -0400
 Prioritize fetching descriptors and networkstatus docs over fetching more extrainfo docs.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15976] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-20 11:41:13 UTC (rev 12066)
+++ tor/trunk/ChangeLog	2007-10-20 23:45:07 UTC (rev 12067)
@@ -83,6 +83,9 @@
   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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-10-20 11:41:13 UTC (rev 12066)
+++ tor/trunk/src/or/routerlist.c	2007-10-20 23:45:07 UTC (rev 12067)
@@ -3801,6 +3801,8 @@
     return;
   if (should_delay_dir_fetches(options))
     return;
+  if (!router_have_minimum_dir_info())
+    return;
 
   pending = digestmap_new();
   list_pending_descriptor_downloads(pending, 1);