From 994595ae5d0bc5e72bdeb9a2e7889b9f52b8b3c8 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 23 May 2017 09:47:11 -0400 Subject: Don't say "downloading 1 descriptor, 4 at a time" Fixes bug 19648, bugfix on 0.1.1.8-alpha. --- src/or/routerlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/or/routerlist.c') diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a790265afb..b7ed87aba6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5054,8 +5054,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"; -- cgit v1.2.3-54-g00ecf