aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug196485
-rw-r--r--src/or/routerlist.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug19648 b/changes/bug19648
new file mode 100644
index 0000000000..e8c2a6a094
--- /dev/null
+++ 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
index 8adaaf6c05..49caa875fe 100644
--- 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";