Merge branch 'maint-0.2.9' into maint-0.3.0

This commit is contained in:
Nick Mathewson 2017-12-11 16:51:58 -05:00
commit 7fcb222ab7
2 changed files with 14 additions and 0 deletions

9
changes/bug23985 Normal file
View File

@ -0,0 +1,9 @@
o Minor bugfixes (bootstrapping):
- Fetch descriptors aggressively whenever we lack enough
to build circuits, regardless of how many descriptors we are missing.
Previously, we would delay launching the fetch when we had fewer than
15 missing descriptors, even if some of those descriptors were
blocking circuits from building. Fixes bug 23985; bugfix on
0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
when we began treating missing descriptors from our primary guards
as a reason to delay circuits.

View File

@ -5016,6 +5016,11 @@ launch_descriptor_downloads(int purpose,
log_debug(LD_DIR,
"There are enough downloadable %ss to launch requests.",
descname);
} else if (! router_have_minimum_dir_info()) {
log_debug(LD_DIR,
"We are only missing %d %ss, but we'll fetch anyway, since "
"we don't yet have enough directory info.",
n_downloadable, descname);
} else {
/* should delay */