Don't stop fetching descriptors when FetchUselessDescriptors is

set, even if we stop asking for circuits. Bugfix on 0.1.2.x;
reported by tup and ioerror.


svn:r12430

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index aa4bc3fc8d..02a5172eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@ Changes in version 0.2.0.10-alpha - 2007-11-07
   o Minor bugfixes:
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.
+    - Don't stop fetching descriptors when FetchUselessDescriptors is
+      set, even if we stop asking for circuits. Bugfix on 0.1.2.x;
+      reported by tup and ioerror.
     - Better log message on vote from unknown authority.
     - Don't log "Launching 0 request for 0 router".
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 1e20d4b3af..23229fd414 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3753,10 +3753,9 @@ update_consensus_router_descriptor_downloads(time_t now)
   int n_delayed=0, n_have=0, n_would_reject=0, n_wouldnt_use=0,
     n_inprogress=0, n_in_oldrouters=0;
 
-  if (!dirserver) {
-    if (rep_hist_circbuilding_dormant(now))
-      goto done;
-  }
+  if (!dirserver && !options->FetchUselessDescriptors &&
+      rep_hist_circbuilding_dormant(now))
+    goto done;
   if (!consensus)
     goto done;