commit 736e7299ce04bd96aa75c50f7dd7ecba36945917
parent f7b41bcdf0d8d3c7ac289d0cb5551988e6ff6b85
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Dec 2017 16:51:58 -0500
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat:
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/changes/bug23985 b/changes/bug23985
@@ -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.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
@@ -5014,6 +5014,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 */
