diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:51:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:51:58 -0500 |
| commit | 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 (patch) | |
| tree | d585a945558695f2e245d419e63fd1b61194b332 | |
| parent | c55a0542369d01f39472cc502c8e27ff85250dc6 (diff) | |
| parent | 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 (diff) | |
| download | tor-7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9.tar.gz tor-7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -rw-r--r-- | changes/bug23985 | 9 | ||||
| -rw-r--r-- | src/or/routerlist.c | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug23985 b/changes/bug23985 new file mode 100644 index 0000000000..9cb5937962 --- /dev/null +++ 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 index 83e513448d..f2ab6051c7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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 */ |