June 2013 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 89ebea055a35873619e94b613233f30b6a2bd8ee Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 19:15:43 2013 +0000 Update translations for vidalia_help --- zh_CN/services.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 392ee6a..3e9a08d 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -1,6 +1,7 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 2013 # Christopher Meng <cickumqt(a)gmail.com>, 2012 # Curtis Stone <cstone(a)fastmail.cn>, 2012 # p1ckw1ck <p1ckw1ck(a)teachers.org>, 2012 @@ -9,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-30 18:39+0000\n" +"PO-Revision-Date: 2013-06-30 19:10+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -118,7 +119,7 @@ msgid "" "hidden service, the field says \"[Created by Tor]\"; in order to make it " "display the real onion address, you need to save your configuration and re-" "open the settings window." -msgstr "Onion 网址（生成）：服务（或 onion）地址由 Tor 生成，以便为服务提供唯一的标识。用户可通过 onion 地址访问服务。为了避免输入错误，可使用\"复制到剪贴板\"按钮。如果隐藏服务刚刚创建，该地址将显示 \"[Created by Tor]\"。为了显示真正的 onion 地址，需保存配置并重新打开设置窗口。" +msgstr "Onion 网址（生成）：服务（或 onion）地址由 Tor 生成，以便为服务提供唯一的标识。用户可通过 onion 地址访问服务。为了避免输入错误，可使用“复制到剪贴板”按钮。如果隐藏服务刚刚创建，该地址将显示“[Created by Tor]”。为了显示真正的 onion 地址，需保存配置并重新打开设置窗口。" #. type: Content of: <html><body><p><ul><li> #: en/services.html:68 @@ -140,7 +141,7 @@ msgid "" "localhost:5222 (or on whatever port your server is listening). If you don't " "specify any target, Tor will redirect requests to the port specified in " "\"Virtual Port\" on localhost." -msgstr "目标（可选）：通常 Tor 将连接请求转发至本地主机时所用的端口与指定的\"虚拟端口\"不同。因此，可指定一个包含物理地址与端口的目标（如 localhost:5222 或服务器侦听的任意端口），隐藏服务的请求将被重定向至该目标。如果未指定目标，请求将备 Tor 重定向至本地主机上指定的\"虚拟端口\"。" +msgstr "目标（可选）：通常 Tor 将连接请求转发至本地主机时所用的端口与指定的“虚拟端口”不同。因此，可指定一个包含物理地址与端口的目标（如 localhost:5222 或服务器侦听的任意端口），隐藏服务的请求将被重定向至该目标。如果未指定目标，请求将备 Tor 重定向至本地主机上指定的“虚拟端口”。" #. type: Content of: <html><body><p><ul><li> #: en/services.html:81 @@ -166,7 +167,7 @@ msgid "" "hidden service in Tor. This can be useful for keeping the configuration of a" " currently unused service for later use. All non-enabled services are stored" " in the Vidalia-specific configuration file vidalia.conf." -msgstr "已启用：如果禁用该选项，Vidalia 将不会对 Tor 指定的隐藏服务进行配置。对于保存当前未用的服务配置已备后用，这是非常有用的。所有未启用的服务均保存在 Vidalia 专用配置文件 vidalia.conf 中。" +msgstr "已启用：如果禁用该选项，Vidalia 将不对 Tor 指定的隐藏服务进行配置。对于保存当前未用的服务配置已备后用，这是非常有用的。所有未启用的服务均保存在 Vidalia 专用配置文件 vidalia.conf 中。" #. type: Content of: <html><body> #: en/services.html:103 @@ -176,7 +177,7 @@ msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "这五个按钮用的作用是什么？" +msgstr "这五个按钮的作用是什么？" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 @@ -218,7 +219,7 @@ msgid "" "Tor allows configuration of more specific settings for hidden services, e.g." " forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." -msgstr "Tor 允许对隐藏服务更具体的设置进行配置，例如强制使用（或避开）某些节点作为引入点，或为同一服务提供多个虚拟端口。" +msgstr "Tor 允许对隐藏服务更为特定的设置进行配置，例如强制使用（或避开）某些节点作为引入点，或为同一服务提供多个虚拟端口。" #. type: Content of: <html><body><p> #: en/services.html:128

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit fd857504e79d9edb9b6fe7aa91d4b1d6b36f87ec Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:45:47 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/services.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 12281d3..392ee6a 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-30 17:59+0000\n" +"PO-Revision-Date: 2013-06-30 18:39+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 789a8ff0ceb10b9e8a8b1bdaed3245308576760d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:45:34 2013 +0000 Update translations for vidalia_help --- zh_CN/services.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 12281d3..392ee6a 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-30 17:59+0000\n" +"PO-Revision-Date: 2013-06-30 18:39+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 3714edf61110d535643e5047e8f5835c1a9ce0b3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:16:35 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 2e4ad20..d9c5419 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -7,9 +7,9 @@ torbirdy.enabled.torification=TorBirdy 已启用：透明 Torification torbirdy.enabled.whonix=TorBirdy 已启用：Whonix torbirdy.disabled=TorBirdy：已禁用！ -torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird's 自动配置向导以保护您的匿名性。\n\n这是 %S 推荐的安全设置。\n\n现在您可以手动配置其他的帐户设置。 +torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird 自动配置向导以保护你的匿名性。\n\n已设置为 %S 的建议安全设置。\n\n现在可手动配置其他帐户设置。 -torbirdy.email.advanced=请注意，不推荐您更改高级设置！\n\n如果您知道在做什么就请继续。 +torbirdy.email.advanced=请注意：建议不要修改高级设置！\n\n除非你非常了解这些操作，否则请勿继续。 torbirdy.email.advanced.nextwarning=下次显示此警告 torbirdy.email.advanced.title=TorBirdy 高级设置

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 5ae8712762d0906442d8167e82136460d4c9c41d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:16:31 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 2e4ad20..d9c5419 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -7,9 +7,9 @@ torbirdy.enabled.torification=TorBirdy 已启用：透明 Torification torbirdy.enabled.whonix=TorBirdy 已启用：Whonix torbirdy.disabled=TorBirdy：已禁用！ -torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird's 自动配置向导以保护您的匿名性。\n\n这是 %S 推荐的安全设置。\n\n现在您可以手动配置其他的帐户设置。 +torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird 自动配置向导以保护你的匿名性。\n\n已设置为 %S 的建议安全设置。\n\n现在可手动配置其他帐户设置。 -torbirdy.email.advanced=请注意，不推荐您更改高级设置！\n\n如果您知道在做什么就请继续。 +torbirdy.email.advanced=请注意：建议不要修改高级设置！\n\n除非你非常了解这些操作，否则请勿继续。 torbirdy.email.advanced.nextwarning=下次显示此警告 torbirdy.email.advanced.title=TorBirdy 高级设置

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit f5c9d9943b2b138a6ccfc39e1eb6f53429d645e0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:15:50 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/services.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 0d2b017..12281d3 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 22:52+0000\n" +"PO-Revision-Date: 2013-06-30 17:59+0000\n" "Last-Translator: simabull tsai\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit 9302b07a5521bcee7324e2ae0c887a203e37a4fd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 18:15:37 2013 +0000 Update translations for vidalia_help --- zh_CN/services.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 0d2b017..12281d3 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 22:52+0000\n" +"PO-Revision-Date: 2013-06-30 17:59+0000\n" "Last-Translator: simabull tsai\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[stem/master] Fix parsing of IPv6 address:port pairs in stream events (fixes #9181)
by atagar＠torproject.org 30 Jun '13

30 Jun '13

commit 8662332c844827b2be4ab7ab1c77027738e5723d Author: David Triendl <david(a)triendl.name> Date: Sat Jun 22 09:03:50 2013 +0200 Fix parsing of IPv6 address:port pairs in stream events (fixes #9181) --- docs/change_log.rst | 5 +++-- stem/response/events.py | 2 +- test/unit/response/events.py | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index d7f6a53..635a8de 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within stem's `git repository * The :class:`~stem.control.Controller` use of cached content wasn't thread safe (:trac:`8607`) * Added :func:`~stem.control.Controller.get_user` method to the:class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_pid` method to the:class:`~stem.control.Controller` + * :class:`~stem.response.events.StreamEvent` didn't recognize IPv6 addresses (:trac:`9181`) * **Descriptors** @@ -64,8 +65,8 @@ The following are only available within stem's `git repository * **Website** * Overhaul of stem's `download page <download.html>`_. This included several - improvements, most notably the addition of PyPI, Ubuntu, Fedora, and - FreeBSD. + improvements, most notably the addition of PyPI, Ubuntu, Fedora, Slackware, + and FreeBSD. * Replaced default sphinx header with a navbar menu. * Added this change log. * Added the `FAQ page <faq.html>`_. diff --git a/stem/response/events.py b/stem/response/events.py index b6badd6..75f2532 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -822,7 +822,7 @@ class StreamEvent(Event): if not ':' in self.target: raise stem.ProtocolError("Target location must be of the form 'address:port': %s" % self) - address, port = self.target.split(':', 1) + address, port = self.target.rsplit(':', 1) if not connection.is_valid_port(port, allow_zero = True): raise stem.ProtocolError("Target location's port is invalid: %s" % self) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 0d56309..9c4de01 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -317,6 +317,8 @@ STREAM_DNS_REQUEST_BAD_2 = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:dns \ PURPOSE=DNS_REQUEST" +STREAM_NEWRESOLVE_IP6 = "650 STREAM 23 NEWRESOLVE 0 2001:db8::1:0 PURPOSE=DNS_REQUEST" + def _get_event(content): controller_event = mocking.get_message(content) @@ -1118,6 +1120,25 @@ class TestEvents(unittest.TestCase): # SOURCE_ADDR's port is malformed self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_2) + # IPv6 address + event = _get_event(STREAM_NEWRESOLVE_IP6) + + self.assertTrue(isinstance(event, stem.response.events.StreamEvent)) + self.assertEqual(STREAM_NEWRESOLVE_IP6.lstrip("650 "), str(event)) + self.assertEqual("23", event.id) + self.assertEqual(StreamStatus.NEWRESOLVE, event.status) + self.assertEqual(None, event.circ_id) + self.assertEqual("2001:db8::1:0", event.target) + self.assertEqual("2001:db8::1", event.target_address) + self.assertEqual(0, event.target_port) + self.assertEqual(None, event.reason) + self.assertEqual(None, event.remote_reason) + self.assertEqual(None, event.source) + self.assertEqual(None, event.source_addr) + self.assertEqual(None, event.source_address) + self.assertEqual(None, event.source_port) + self.assertEqual(StreamPurpose.DNS_REQUEST, event.purpose) + def test_stream_bw_event(self): event = _get_event("650 STREAM_BW 2 15 25")

1 0

[stem/master] Adding Slackware to our download page
by atagar＠torproject.org 30 Jun '13

30 Jun '13

commit 00d78f244bda322f30ecb5d31f3278eeeaa96056 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 30 10:46:11 2013 -0700 Adding Slackware to our download page Markus just added stem to slackbuilds (hazaa!)... http://slackbuilds.org/repository/14.0/python/stem/ --- docs/_static/label/resources/slackware.xcf | Bin 0 -> 3567 bytes docs/_static/label/slackware.png | Bin 0 -> 1783 bytes docs/_static/section/download/slackware.png | Bin 0 -> 10938 bytes docs/download.rst | 21 ++++++++++++++++++--- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/_static/label/resources/slackware.xcf b/docs/_static/label/resources/slackware.xcf new file mode 100644 index 0000000..52fdc38 Binary files /dev/null and b/docs/_static/label/resources/slackware.xcf differ diff --git a/docs/_static/label/slackware.png b/docs/_static/label/slackware.png new file mode 100644 index 0000000..6888a15 Binary files /dev/null and b/docs/_static/label/slackware.png differ diff --git a/docs/_static/section/download/slackware.png b/docs/_static/section/download/slackware.png new file mode 100644 index 0000000..324e046 Binary files /dev/null and b/docs/_static/section/download/slackware.png differ diff --git a/docs/download.rst b/docs/download.rst index 3b76f06..adfd09d 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -28,13 +28,19 @@ Download License: GPL v2 File: NuoveXT/128x128/apps/fedora.png - * FreeBSD - Source: https://en.wikipedia.org/wiki/File:Freebsd_logo.svg - Author: Anton Gural + * Slackware + Source: NuoveXT (http://nuovext.pwsp.net/) + Author: Alexandre Moore (http://sa-ki.deviantart.com/) + License: GPL v2 + File: NuoveXT/128x128/apps/slackware.png * Arch Linux Source: https://en.wikipedia.org/wiki/File:Archlinux-official-fullcolour.svg + * FreeBSD + Source: https://en.wikipedia.org/wiki/File:Freebsd_logo.svg + Author: Anton Gural + * Git Source: https://en.wikipedia.org/wiki/File:Git-logo.svg Author: Jason Long @@ -100,6 +106,15 @@ Download % yum install python-stem + * - .. image:: /_static/section/download/slackware.png + :target: http://slackbuilds.org/repository/14.0/python/stem/ + + - .. image:: /_static/label/slackware.png + :target: http://slackbuilds.org/repository/14.0/python/stem/ + + Package maintained by Markus for Slackware (`instructions + <http://slackbuilds.org/howto/>`_). + * - .. image:: /_static/section/download/archlinux.png :target: https://aur.archlinux.org/packages/stem/

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 30 Jun '13

30 Jun '13

commit bf5d45c6ed19d3fee4f9c32324b01d84317e5112 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 30 17:45:49 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/config.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/config.po b/zh_CN/config.po index 08641c8..85ba831 100644 --- a/zh_CN/config.po +++ b/zh_CN/config.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-06-30 17:00+0000\n" +"PO-Revision-Date: 2013-06-30 17:42+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0