aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-10-20 23:45:07 +0000
committerNick Mathewson <nickm@torproject.org>2007-10-20 23:45:07 +0000
commitdc4e710e27ed98c0e3d2e59ee07d133a6a3a203d (patch)
tree53f41719d0aef07203e2a6be1c05170b33ec2df7
parent9b5af75835ee3b89758f10c548428f09582a7bc6 (diff)
downloadtor-dc4e710e27ed98c0e3d2e59ee07d133a6a3a203d.tar
tor-dc4e710e27ed98c0e3d2e59ee07d133a6a3a203d.tar.gz
r15976@catbus: nickm | 2007-10-20 19:44:47 -0400
Prioritize fetching descriptors and networkstatus docs over fetching more extrainfo docs. svn:r12067
-rw-r--r--ChangeLog3
-rw-r--r--src/or/routerlist.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e5d3c063..b9df1592c 100644
--- 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 6526d5f55..1317c6230 100644
--- 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);