December 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 16ec4da68c1e683d713b29f0408f504dbe635116 Merge: abcc7032c e553bf3ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9 Merge: c55a05423 7e486dd6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/release-0.2.9] Don't delay descriptor fetches when missing info needed for circuits
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a little while. That's fine, if we can go ahead and build circuits... but if not, it's a poor choice indeed. Fixes bug 23985; bugfix on 0.1.1.11-alpha. In 0.3.0.3-alpha, when we made primary guard descriptors necessary for circuit building, this situation got worse. --- changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug23985 b/changes/bug23985 new file mode 100644 index 000000000..9cb593796 --- /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 2365f28fd..1b7c81ad5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5035,6 +5035,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 */

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:51:54 2017 -0500 Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)

1 0

[tor/release-0.3.0] Don't delay descriptor fetches when missing info needed for circuits
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 13:22:16 2017 -0500 Don't delay descriptor fetches when missing info needed for circuits When we have fewer than 15 descriptors to fetch, we will delay the fetch for a little while. That's fine, if we can go ahead and build circuits... but if not, it's a poor choice indeed. Fixes bug 23985; bugfix on 0.1.1.11-alpha. In 0.3.0.3-alpha, when we made primary guard descriptors necessary for circuit building, this situation got worse. --- changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug23985 b/changes/bug23985 new file mode 100644 index 000000000..9cb593796 --- /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 2365f28fd..1b7c81ad5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5035,6 +5035,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 */

1 0