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

[tor/release-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 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-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 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] 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/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit ee1bbe21ab74873b498b143728c17334cbd3ce5e Merge: b63cbec65 04524443d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

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

11 Dec '17

commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.2] 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/release-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 2ea573ece8f168749b40eddcd023b71bf05a4fef Merge: 7fcb222ab eaaa1108a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)

1 0

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

11 Dec '17

commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b Merge: a14ff6b9c 43fb8fc5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2

1 0

[tor/release-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 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/release-0.3.2] 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