nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug19648'

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-06 09:32:22 -04:00
commit 86eb63deb4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug19648 Normal file
View File

@ -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.

5
src/or/routerlist.c
View File

@ -5055,8 +5055,9 @@ launch_descriptor_downloads(int purpose,
if (n_per_request > max_dl_per_req) if (n_per_request > max_dl_per_req)
n_per_request = max_dl_per_req; n_per_request = max_dl_per_req;
if (n_per_request < MIN_DL_PER_REQUEST) if (n_per_request < MIN_DL_PER_REQUEST) {
n_per_request = MIN_DL_PER_REQUEST; n_per_request = MIN(MIN_DL_PER_REQUEST, n_downloadable);
}
if (n_downloadable > n_per_request) if (n_downloadable > n_per_request)
req_plural = rtr_plural = "s"; req_plural = rtr_plural = "s";