[or-cvs] r12399: Fix "0 request for 0 router" message. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-11-06 13:27:14 -0500 (Tue, 06 Nov 2007)
New Revision: 12399

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
 r16459 at catbus:  nickm | 2007-11-06 13:26:11 -0500
 Fix "0 request for 0 router" message.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-06 18:12:25 UTC (rev 12398)
+++ tor/trunk/ChangeLog	2007-11-06 18:27:14 UTC (rev 12399)
@@ -83,6 +83,7 @@
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.
     - Better log message on vote from unknown authority.
+    - Don't log "Launching 0 request for 0 router".
 
   o Minor bugfixes (memory leaks):
     - Stop leaking memory every time we parse a v3 certificate. Bugfix

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-11-06 18:12:25 UTC (rev 12398)
+++ tor/trunk/src/or/routerlist.c	2007-11-06 18:27:14 UTC (rev 12399)
@@ -3527,7 +3527,7 @@
     }
   }
 
-  if (! should_delay) {
+  if (! should_delay && n_downloadable) {
     int i, n_per_request;
     const char *req_plural = "", *rtr_plural = "";
     n_per_request = (n_downloadable+MIN_REQUESTS-1) / MIN_REQUESTS;