October 2012 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 25 Oct '12

25 Oct '12

commit c24852f43ed5c62e242c62bea4e205d84ec074a3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 25 16:15:06 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 964adb0..04f1ff3 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -14,7 +14,7 @@ <string name="tor_process_starting">开启Tor客户端...</string> <string name="tor_process_complete">完成。</string> <string name="tor_process_waiting">等待。</string> - <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string> + <string name="not_anonymous_yet">警告：您的网络通讯还不是匿名的! 请设置您的应用程序使用 HTTP 代理服务器 127.0.0.1:8118 或者 SOCKS4A、SOCKS5 代理服务器 127.0.0.1:9050</string> <string name="menu_home">首页</string> <string name="menu_browse">浏览</string> <string name="menu_settings">设置</string> @@ -24,15 +24,15 @@ <string name="menu_start">启动</string> <string name="menu_stop">停止</string> <string name="menu_about">关于</string> - <string name="menu_wizard">Wizard</string> + <string name="menu_wizard">向导</string> <string name="button_help">帮助</string> <string name="button_close">关闭</string> <string name="button_about">关于</string> - <string name="button_clear_log">Clear Log</string> + <string name="button_clear_log">清除日志</string> <string name="menu_verify">检查</string> <string name="menu_exit">退出</string> - <string name="press_to_start">- 长按以启动 -</string> - <string name="pref_trans_proxy_group">透明代理(需要 root)</string> + <string name="press_to_start">- 长按开始启动 -</string> + <string name="pref_trans_proxy_group">透明代理（需要 ROOT 权限）</string> <string name="pref_trans_proxy_title">透明代理</string> <string name="pref_trans_proxy_summary">自动对应用程序使用 Tor</string> <string name="pref_transparent_all_title">对所有应用使用 Tor</string>

1 0

[tor/master] Optimistically say 0.2.4.5-alpha is coming out today
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit d44b7bb525b013af82c39b5000f21f901e4ed518 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:57:20 2012 -0400 Optimistically say 0.2.4.5-alpha is coming out today --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a55d47..b348392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.4.5-alpha - 2012-10-2? +Changes in version 0.2.4.5-alpha - 2012-10-25 Tor 0.2.3.24-rc comes hard at the heels of 0.2.4.4-alpha, to fix two important security vulnerabilities that could lead to remotely triggerable relay crashes, fixes a major bug that was preventing

1 0

[tor/master] Bump the version number to 0.2.4.5-alpha
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit c331694d060b85d2cbb024023fbbfea5a467ff86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:44:14 2012 -0400 Bump the version number to 0.2.4.5-alpha (For real this time. It turns out that 4 and 5 are different numbers.) --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 60631a5..0ccae47 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.4-alpha]) +AC_INIT([tor],[0.2.4.5-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 762cbb1..6cd280d 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.4-alpha" +!define VERSION "0.2.4.5-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f703d29..ba85996 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.4-alpha" +#define VERSION "0.2.4.5-alpha"

1 0

[tor/release-0.2.3] Remove folded-in changes file
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 41a3cb592307133faf6824994ade153fa96595b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:31:44 2012 -0400 Remove folded-in changes file --- changes/link_negotiation_assert | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/changes/link_negotiation_assert b/changes/link_negotiation_assert deleted file mode 100644 index 398a545..0000000 --- a/changes/link_negotiation_assert +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixs (security): - - Fix a group of remotely triggerable assertion failures related to - incorrect link protocol negotiation. Found, diagnosed, and fixed - by "some guy from France." Fix for CVE-2012-2250; bugfix on - 0.2.3.6-alpha. -

1 0

[tor/master] Bump version to 0.2.4.5-alpha
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 951b5b7e6a7ef4839e4707c2a21b3c6871e2419e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:33:17 2012 -0400 Bump version to 0.2.4.5-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1ca75cc..60631a5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.4-alpha-dev]) +AC_INIT([tor],[0.2.4.4-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d2c5f3a..762cbb1 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.4-alpha-dev" +!define VERSION "0.2.4.4-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 258fddc..f703d29 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.4-alpha-dev" +#define VERSION "0.2.4.4-alpha"

1 0

[tor/master] Fold in changelog item; draft blurb for 0.2.4.5-alpha
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit b6e0236fa20d001ba3f940caf37b5434bf76401a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:32:20 2012 -0400 Fold in changelog item; draft blurb for 0.2.4.5-alpha --- ChangeLog | 26 ++++++++++++++++++-------- changes/link_negotiation_assert | 6 ------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index f312b22..1a55d47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,20 @@ Changes in version 0.2.4.5-alpha - 2012-10-2? - o Major bugfixes (also in 0.2.3.24-rc): + Tor 0.2.3.24-rc comes hard at the heels of 0.2.4.4-alpha, to fix two + important security vulnerabilities that could lead to remotely + triggerable relay crashes, fixes a major bug that was preventing + clients from choosing good exit nodes, and refactor some of our code. + + o Major bugfixes (security, also in 0.2.3.24-rc): + - Fix a group of remotely triggerable assertion failures related to + incorrect link protocol negotiation. Found, diagnosed, and fixed + by "some guy from France." Fix for CVE-2012-2250; bugfix on + 0.2.3.6-alpha. - Fix a denial of service attack by which any directory authority could crash all the others, or by which a single v2 directory authority could crash everybody downloading v2 directory information. Fixes bug 7191; bugfix on 0.2.0.10-alpha. + + o Major bugfixes (also in 0.2.3.24-rc): - When parsing exit policy summaries from microdescriptors, we had previously been ignoring the last character in each one, so that "accept 80,443,8080" would be treated by clients as indicating @@ -19,18 +30,17 @@ Changes in version 0.2.4.5-alpha - 2012-10-2? an exit relay would allow exiting to an internal address. Fixes bug 7190; bugfix on 0.2.3.1-alpha. - o Code simplification and refactoring: - - Start using OpenBSD's implementation of queue.h (originally by Niels - Provos). - - Move the entry node code from circuitbuild.c to its own file. - - Move the circuit build timeout tracking code from circuitbuild.c - to its own file. - o Minor bugfixes: - Only disable TLS session ticket support when running as a TLS server. This keeps clients harder to distinguish from regular firefox connections. Fixes bug 7189; bugfix on Tor 0.2.3.23-rc. + o Code simplification and refactoring: + - Start using OpenBSD's implementation of queue.h (originally by + Niels Provos). + - Move the entry node code from circuitbuild.c to its own file. + - Move the circuit build timeout tracking code from circuitbuild.c + to its own file. Changes in version 0.2.4.4-alpha - 2012-10-20 diff --git a/changes/link_negotiation_assert b/changes/link_negotiation_assert deleted file mode 100644 index 398a545..0000000 --- a/changes/link_negotiation_assert +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixs (security): - - Fix a group of remotely triggerable assertion failures related to - incorrect link protocol negotiation. Found, diagnosed, and fixed - by "some guy from France." Fix for CVE-2012-2250; bugfix on - 0.2.3.6-alpha. -

1 0

[tor/release-0.2.3] Bump version to 0.2.3.24-rc.
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 0b68f6221b3b3e9ffb44326a3a047df77197eff7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:29:14 2012 -0400 Bump version to 0.2.3.24-rc. --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 6ce4506..124bf9f 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.23-rc) +AM_INIT_AUTOMAKE(tor, 0.2.3.24-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index e884aeb..2f02a3f 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.23-rc" +!define VERSION "0.2.3.24-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9b2daf2..5a67369 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.23-rc" +#define VERSION "0.2.3.24-rc"

1 0

[tor/release-0.2.3] Draft blurb for 0.2.3.24-rc; guess a release date
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit f684ac4fc29af4730d3495622340f7bf2dd69584 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 25 10:28:08 2012 -0400 Draft blurb for 0.2.3.24-rc; guess a release date --- ChangeLog | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39d6e4b..fbeb6d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,20 @@ -Changes in version 0.2.3.24-rc - 2012-10-2? - o Major bugfixes: +Changes in version 0.2.3.24-rc - 2012-10-25 + Tor 0.2.3.24-rc fixes two important security vulnerabilities that + could lead to remotely triggerable relay crashes, and fixes + a major bug that was preventing clients from choosing good exit + nodes. + + o Major bugfixes (security): + - Fix a group of remotely triggerable assertion failures related to + incorrect link protocol negotiation. Found, diagnosed, and fixed + by "some guy from France." Fix for CVE-2012-2250; bugfix on + 0.2.3.6-alpha. - Fix a denial of service attack by which any directory authority could crash all the others, or by which a single v2 directory authority could crash everybody downloading v2 directory information. Fixes bug 7191; bugfix on 0.2.0.10-alpha. + + o Major bugfixes: - When parsing exit policy summaries from microdescriptors, we had previously been ignoring the last character in each one, so that "accept 80,443,8080" would be treated by clients as indicating

1 0

[tor/master] Fix a remotely triggerable assertion failure (CVE-2012-2250)
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 758428dd32128874cefacc92ef63c1b5bc9a656e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 22:58:38 2012 -0400 Fix a remotely triggerable assertion failure (CVE-2012-2250) If we completed the handshake for the v2 link protocol but wound up negotiating the wong protocol version, we'd become so confused about what part of the handshake we were in that we'd promptly die with an assertion. This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha. All servers running that version or later should really upgrade. Bug and fix from "some guy from France." I tweaked his code slightly to make it log the IP of the offending node. --- changes/link_negotiation_assert | 6 ++++++ src/or/command.c | 9 +++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/changes/link_negotiation_assert b/changes/link_negotiation_assert new file mode 100644 index 0000000..398a545 --- /dev/null +++ b/changes/link_negotiation_assert @@ -0,0 +1,6 @@ + o Major bugfixs (security): + - Fix a group of remotely triggerable assertion failures related to + incorrect link protocol negotiation. Found, diagnosed, and fixed + by "some guy from France." Fix for CVE-2012-2250; bugfix on + 0.2.3.6-alpha. + diff --git a/src/or/command.c b/src/or/command.c index 975af04..d935b5b 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -719,6 +719,15 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn) "handshake. Closing connection."); connection_mark_for_close(TO_CONN(conn)); return; + } else if (highest_supported_version != 2 && + conn->_base.state == OR_CONN_STATE_OR_HANDSHAKING_V2) { + /* XXXX This should eventually be a log_protocol_warn */ + log_fn(LOG_WARN, LD_OR, + "Negotiated link with non-2 protocol after doing a v2 TLS " + "handshake with %s. Closing connection.", + fmt_addr(&conn->_base.addr)); + connection_mark_for_close(TO_CONN(conn)); + return; } conn->link_proto = highest_supported_version;

1 0

[tor/master] Fix a remotely triggerable assertion failure (CVE-2012-2250)
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit c442d85439dd406c846e930dedcd8ed4c780d66e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 23:04:35 2012 -0400 Fix a remotely triggerable assertion failure (CVE-2012-2250) If we completed the handshake for the v2 link protocol but wound up negotiating the wong protocol version, we'd become so confused about what part of the handshake we were in that we'd promptly die with an assertion. This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha. All servers running that version or later should really upgrade. Bug and fix from "some guy from France." I tweaked his code slightly to make it log the IP of the offending node, and to forward-port it to 0.2.4. --- changes/link_negotiation_assert | 6 ++++++ src/or/channeltls.c | 9 +++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/changes/link_negotiation_assert b/changes/link_negotiation_assert new file mode 100644 index 0000000..398a545 --- /dev/null +++ b/changes/link_negotiation_assert @@ -0,0 +1,6 @@ + o Major bugfixs (security): + - Fix a group of remotely triggerable assertion failures related to + incorrect link protocol negotiation. Found, diagnosed, and fixed + by "some guy from France." Fix for CVE-2012-2250; bugfix on + 0.2.3.6-alpha. + diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 4e3c20a..d094d15 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1229,6 +1229,15 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) "handshake. Closing connection."); connection_or_close_for_error(chan->conn, 0); return; + } else if (highest_supported_version != 2 && + chan->conn->base_.state == OR_CONN_STATE_OR_HANDSHAKING_V2) { + /* XXXX This should eventually be a log_protocol_warn */ + log_fn(LOG_WARN, LD_OR, + "Negotiated link with non-2 protocol after doing a v2 TLS " + "handshake with %s. Closing connection.", + fmt_addr(&chan->conn->base_.addr)); + connection_or_close_for_error(chan->conn, 0); + return; } chan->conn->link_proto = highest_supported_version;

1 0