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

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

11 Dec '17

commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

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

11 Dec '17

commit bc1ea4f470734f7fa22949318a98e286da5cba49 Merge: f97f301b5 f5d4bdf30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:11 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --cc src/or/router.c index bc7a2fcfc,e1c2d20b3..b134f2e31 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2310,9 -2063,8 +2310,9 @@@ mark_my_descriptor_dirty(const char *re } /** How frequently will we republish our descriptor because of large (factor - * of 2) shifts in estimated bandwidth? */ + * of 2) shifts in estimated bandwidth? Note: We don't use this constant + * if our previous bandwidth estimate was exactly 0. */ - #define MAX_BANDWIDTH_CHANGE_FREQ (20*60) + #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60) /** Check whether bandwidth has changed a lot since the last time we announced * bandwidth. If so, mark our descriptor dirty. */

1 0

[tor/maint-0.2.5] relay: Change bandwidth stats interval to 24 hours
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 22 09:25:07 2017 -0500 relay: Change bandwidth stats interval to 24 hours Going from 4 hours to 24 hours in order to try reduce the efficiency of guard discovery attacks. Closes #23856 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket23856 b/changes/ticket23856 new file mode 100644 index 000000000..049da18d0 --- /dev/null +++ b/changes/ticket23856 @@ -0,0 +1,4 @@ + o Minor feature (relay statistics): + - Change relay bandwidth reporting stats interval from 4 hours to 24 hours + in order to reduce the efficiency of guard discovery attacks. Fixes + ticket 23856. diff --git a/src/or/rephist.c b/src/or/rephist.c index cedc56af0..5acc8f351 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1131,9 +1131,9 @@ rep_hist_load_mtbf_data(time_t now) * totals? */ #define NUM_SECS_ROLLING_MEASURE 10 /** How large are the intervals for which we track and report bandwidth use? */ -#define NUM_SECS_BW_SUM_INTERVAL (4*60*60) +#define NUM_SECS_BW_SUM_INTERVAL (24*60*60) /** How far in the past do we remember and publish bandwidth use? */ -#define NUM_SECS_BW_SUM_IS_VALID (24*60*60) +#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60) /** How many bandwidth usage intervals do we remember? (derived) */ #define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL) diff --git a/src/or/router.c b/src/or/router.c index 90b2431a2..e1c2d20b3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2064,7 +2064,7 @@ mark_my_descriptor_dirty(const char *reason) /** How frequently will we republish our descriptor because of large (factor * of 2) shifts in estimated bandwidth? */ -#define MAX_BANDWIDTH_CHANGE_FREQ (20*60) +#define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60) /** Check whether bandwidth has changed a lot since the last time we announced * bandwidth. If so, mark our descriptor dirty. */

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:53:02 2017 -0500 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] 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/maint-0.3.1] 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/maint-0.3.1] 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/maint-0.3.2] 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.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.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