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

[tor/release-0.3.2] Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit c80293706fe16c052efef6653079163fc117029a Merge: f46cdb3ff 01e984870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 09:48:51 2017 -0500 Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2 changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

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

06 Nov '17

commit 3beb3dac2db492df1686abd1d2c047d5ee6cddcc Merge: f755f9b9e c80293706 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 09:49:06 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Remove an erroneous 0.5 in compute_weighted_bandwidths()
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 15:29:15 2017 -0400 Remove an erroneous 0.5 in compute_weighted_bandwidths() Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using double to using uint64 for selecting by bandwidth, I got the math wrong: I should have used llround(x), or (uint64_t)(x+0.5), but instead I wrote llround(x+0.5). That means we would always round up, rather than rounding to the closest integer Fixes bug 23318; bugfix on 0.2.4.3-alpha. --- changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug23318 b/changes/bug23318 new file mode 100644 index 000000000..32c85eb19 --- /dev/null +++ b/changes/bug23318 @@ -0,0 +1,7 @@ + o Minor bugfixes (path selection): + - When selecting relays by bandwidth, avoid a rounding error that + could sometimes cause load to be imbalanced incorrectly. Previously, + we would always round upwards; now, we round towards the nearest + integer. This had the biggest effect when a relay's weight adjustments + should have given it weight 0, but it got weight 1 instead. + Fixes bug 23318; bugfix on 0.2.4.3-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2365f28fd..faf2eeda5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2713,7 +2713,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, final_weight = weight*this_bw; } - bandwidths[node_sl_idx] = final_weight + 0.5; + bandwidths[node_sl_idx] = final_weight; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit c80293706fe16c052efef6653079163fc117029a Merge: f46cdb3ff 01e984870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 09:48:51 2017 -0500 Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2 changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit c80293706fe16c052efef6653079163fc117029a Merge: f46cdb3ff 01e984870 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 09:48:51 2017 -0500 Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2 changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove an erroneous 0.5 in compute_weighted_bandwidths()
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 15:29:15 2017 -0400 Remove an erroneous 0.5 in compute_weighted_bandwidths() Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using double to using uint64 for selecting by bandwidth, I got the math wrong: I should have used llround(x), or (uint64_t)(x+0.5), but instead I wrote llround(x+0.5). That means we would always round up, rather than rounding to the closest integer Fixes bug 23318; bugfix on 0.2.4.3-alpha. --- changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug23318 b/changes/bug23318 new file mode 100644 index 000000000..32c85eb19 --- /dev/null +++ b/changes/bug23318 @@ -0,0 +1,7 @@ + o Minor bugfixes (path selection): + - When selecting relays by bandwidth, avoid a rounding error that + could sometimes cause load to be imbalanced incorrectly. Previously, + we would always round upwards; now, we round towards the nearest + integer. This had the biggest effect when a relay's weight adjustments + should have given it weight 0, but it got weight 1 instead. + Fixes bug 23318; bugfix on 0.2.4.3-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2365f28fd..faf2eeda5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2713,7 +2713,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, final_weight = weight*this_bw; } - bandwidths[node_sl_idx] = final_weight + 0.5; + bandwidths[node_sl_idx] = final_weight; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "

1 0

[tor/maint-0.3.2] Remove an erroneous 0.5 in compute_weighted_bandwidths()
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 15:29:15 2017 -0400 Remove an erroneous 0.5 in compute_weighted_bandwidths() Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using double to using uint64 for selecting by bandwidth, I got the math wrong: I should have used llround(x), or (uint64_t)(x+0.5), but instead I wrote llround(x+0.5). That means we would always round up, rather than rounding to the closest integer Fixes bug 23318; bugfix on 0.2.4.3-alpha. --- changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug23318 b/changes/bug23318 new file mode 100644 index 000000000..32c85eb19 --- /dev/null +++ b/changes/bug23318 @@ -0,0 +1,7 @@ + o Minor bugfixes (path selection): + - When selecting relays by bandwidth, avoid a rounding error that + could sometimes cause load to be imbalanced incorrectly. Previously, + we would always round upwards; now, we round towards the nearest + integer. This had the biggest effect when a relay's weight adjustments + should have given it weight 0, but it got weight 1 instead. + Fixes bug 23318; bugfix on 0.2.4.3-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2365f28fd..faf2eeda5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2713,7 +2713,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, final_weight = weight*this_bw; } - bandwidths[node_sl_idx] = final_weight + 0.5; + bandwidths[node_sl_idx] = final_weight; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "

1 0

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

06 Nov '17

commit 8c9b5bfb8c0d933fb76e41bb2f6790bd6185b8ff Merge: 6bc1632b7 c80293706 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 09:49:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit 1390fd1596d9772a4b68529865b6c98ff63234c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 14:48:10 2017 +0000 Update translations for tails-perl5lib_completed --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po index 5f5766c8e..2b919011c 100644 --- a/nl.po +++ b/nl.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+0000\n" -"Last-Translator: Volluta <volluta(a)tutanota.com>\n" +"PO-Revision-Date: 2017-11-06 14:34+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit 1521757b6d8dee82c9e221d204a27213830156db Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 14:48:04 2017 +0000 Update translations for tails-perl5lib --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po index 5f5766c8e..2b919011c 100644 --- a/nl.po +++ b/nl.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+0000\n" -"Last-Translator: Volluta <volluta(a)tutanota.com>\n" +"PO-Revision-Date: 2017-11-06 14:34+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0