tor

commit 86eb63deb45f2d21375bee74ef4758c24974a97e
parent 720552b04c86e1b823d12bfde71ba052f4246e1c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  6 Jul 2017 09:32:22 -0400

Merge remote-tracking branch 'public/bug19648'

Diffstat:
A
changes/bug19648
 | 
5
+++++
M
src/or/routerlist.c
 | 
5
+++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug19648 b/changes/bug19648
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging):
+    - When logging the number of descriptors we intend to download per
+      directory request, do not log a number higher than then the
+      number of descriptors we're fetching in total. Fixes bug 19648;
+      bugfix on 0.1.1.8-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
@@ -5055,8 +5055,9 @@ launch_descriptor_downloads(int purpose,
   if (n_per_request > max_dl_per_req)
     n_per_request = max_dl_per_req;
 
-  if (n_per_request < MIN_DL_PER_REQUEST)
-    n_per_request = MIN_DL_PER_REQUEST;
+  if (n_per_request < MIN_DL_PER_REQUEST) {
+    n_per_request = MIN(MIN_DL_PER_REQUEST, n_downloadable);
+  }
 
   if (n_downloadable > n_per_request)
     req_plural = rtr_plural = "s";