- tor-commits - lists.torproject.org

[tor/release-0.2.3] Avoid segfault if EntryGuardPathBias precedes EntryGuard
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 9d9ca264ec7505cdaf4a0032eac4489be6a52076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 13:27:54 2012 -0400 Avoid segfault if EntryGuardPathBias precedes EntryGuard Fix for bug 6774; bugfix on 0.2.3.17-beta. --- changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000..0c137fd --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e557601..9d52b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value));

1 0

[tor/release-0.2.3] Merge branch 'maint-0.2.3' into release-0.2.3
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 59deac92a1b9bea4c1340c7aa533e3105c7df266 Merge: 5ee0fda 97dbff5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:46:23 2012 -0400 Merge branch 'maint-0.2.3' into release-0.2.3 changes/bug6774 | 4 ++++ doc/tor.1.txt | 4 ++-- src/or/circuitbuild.c | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.3] fold in last changes file
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 139a81c96d4af2f52b1f3d76adc4079403c8d2d7 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 17:22:23 2012 -0400 fold in last changes file --- ChangeLog | 2 ++ changes/bug6774 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c63e10..2e78957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,8 @@ Changes in version 0.2.3.21-rc - 2012-09-05 when provided via the controller's MapAddress command. Previously, they were accepted, but we never actually noticed that they were wildcards. Fixes bug 6244; bugfix on 0.2.3.9-alpha. + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fixes bug 6774; bugfix on 0.2.3.17-beta. - Add a (probably redundant) memory clear between iterations of the router status voting loop, to prevent future coding errors where data might leak between iterations of the loop. Resolves diff --git a/changes/bug6774 b/changes/bug6774 deleted file mode 100644 index 0c137fd..0000000 --- a/changes/bug6774 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Avoid crashing on a malformed state file where EntryGuardPathBias - precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. -

1 0

[tor/master] Update the minimum bandwidth for a public relay
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 97dbff51e60273b29d7dc15e4106c600e8efa34e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:40:57 2012 -0400 Update the minimum bandwidth for a public relay The current cutoff is 30KB, but in reality a useful cutoff is probably more like 50KB or 100KB. --- doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 62259b7..0bd9709 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -126,8 +126,8 @@ GENERAL OPTIONS A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 20 KB (that is, - 20480 bytes). (Default: 5 MB) + public network, this needs to be _at the very least_ 30 KB (that is, + 30720 bytes). (Default: 5 MB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 6f82ae44cb85e61a729ccb7ce47451dae97e8602 Merge: f8c1ab7 97dbff5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:41:43 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Update the minimum bandwidth for a public relay
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 97dbff51e60273b29d7dc15e4106c600e8efa34e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:40:57 2012 -0400 Update the minimum bandwidth for a public relay The current cutoff is 30KB, but in reality a useful cutoff is probably more like 50KB or 100KB. --- doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 62259b7..0bd9709 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -126,8 +126,8 @@ GENERAL OPTIONS A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 20 KB (that is, - 20480 bytes). (Default: 5 MB) + public network, this needs to be _at the very least_ 30 KB (that is, + 30720 bytes). (Default: 5 MB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given

1 0

[tor/master] Avoid segfault if EntryGuardPathBias precedes EntryGuard
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 9d9ca264ec7505cdaf4a0032eac4489be6a52076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 13:27:54 2012 -0400 Avoid segfault if EntryGuardPathBias precedes EntryGuard Fix for bug 6774; bugfix on 0.2.3.17-beta. --- changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000..0c137fd --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e557601..9d52b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value));

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit f8c1ab7bbf7e7f4528406ae5ba7837866642549d Merge: 0770e4c 9d9ca26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 16:25:13 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] Avoid segfault if EntryGuardPathBias precedes EntryGuard
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 9d9ca264ec7505cdaf4a0032eac4489be6a52076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 13:27:54 2012 -0400 Avoid segfault if EntryGuardPathBias precedes EntryGuard Fix for bug 6774; bugfix on 0.2.3.17-beta. --- changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000..0c137fd --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e557601..9d52b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value));

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 05 Sep '12

05 Sep '12

commit 14783ad6593cb41738c9c239e92d94dd506e30d0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 5 19:15:10 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index e92f8c6..a59dd14 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-04-21 12:37+0000\n" -"Last-Translator: eduardzanony <eduard.zanony(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-05 19:06+0000\n" +"Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -2036,7 +2036,7 @@ msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended." -msgstr "" +msgstr "Súčasná verzia Tor nie je aktuálna alebo sa už viacej neodporúča používať." msgctxt "MainWindow" msgid "" @@ -2045,7 +2045,7 @@ msgstr "" msgctxt "MainWindow" msgid "Potentially Unsafe Connection" -msgstr "" +msgstr "Potenciálne Nebezpečné Pripojenie" msgctxt "MainWindow" msgid "" @@ -2059,7 +2059,7 @@ msgstr "" msgctxt "MainWindow" msgid "Your software is up to date" -msgstr "" +msgstr "Váš softvér je aktuálny" msgctxt "MainWindow" msgid ""

1 0