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

[tor/master] Fix warnings.
by nickm＠torproject.org 01 Dec '11

01 Dec '11

commit c06c80b7f7911b0d5c99860ef8c4770cacdbe0a2 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Dec 1 09:40:47 2011 +0100 Fix warnings. Remove environ declaration. Use ORPort->value. And it's a string. Make tmp a char *. --- src/or/transports.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index eaaf1a3..06bc039 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -946,10 +946,8 @@ static void set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) { const or_options_t *options = get_options(); - extern char **environ; - - LPVOID tmp=NULL; + char *tmp=NULL; char *state_tmp=NULL; char *state_env=NULL; char *transports_to_launch=NULL; @@ -992,7 +990,8 @@ set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) smartlist_add(envs, transports_env); if (mp->is_server) { - tor_asprintf(&orport_env, "TOR_PT_ORPORT=127.0.0.1:%d", options->ORPort); + tor_asprintf(&orport_env, "TOR_PT_ORPORT=127.0.0.1:%s", + options->ORPort->value); bindaddr_tmp = get_bindaddr_for_proxy(mp); tor_asprintf(&bindaddr_env, "TOR_PT_SERVER_BINDADDR=%s", bindaddr_tmp);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 01 Dec '11

01 Dec '11

commit 2ce3aadc88c95d0df82431b53761a796e8ad43bc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 1 12:15:27 2011 +0000 Update translations for vidalia_help --- zh_CN/bridges.po | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zh_CN/bridges.po b/zh_CN/bridges.po index ac11b62..368578d 100644 --- a/zh_CN/bridges.po +++ b/zh_CN/bridges.po @@ -1,5 +1,6 @@ # # Translators: +# Kevin Chen <szescxz(a)126.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # snakeyi <snakeyi0624(a)gmail.com>, 2011. # <szescxz(a)126.com>, 2011. @@ -8,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: 2011-11-29 12:32+0000\n" +"PO-Revision-Date: 2011-12-01 12:04+0000\n" "Last-Translator: szescxz <szescxz(a)126.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -97,12 +98,16 @@ msgid "" "attacker to learn lots of bridge addresses, you must send this request from " "a Gmail account." msgstr "" +"您可以通过浏览 https://bridges.torproject.org " +"来获取公共网桥。您从那个页面获取的信息会在数天内自动更新，所以如果您需要更多网桥地址，请周期性地浏览一次。另一种获取公共网桥地址的方式是发送一封电子邮件到" +" bridges(a)torproject.org ，正文中写上 get bridges " +"。为了让攻击者难以获取多个网桥地址（译者注：以防止这些网桥被黑客攻击），您必须使用 Gmail 发送。" #. type: Content of: <html><body> #: en/bridges.html:63 msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." -msgstr "" +msgstr "如果一些网桥地址无法连接，则配置一个以上的网桥地址会使您的 Tor 连接更加坚固。"

1 0

r25239: {website} fix typo reported on tor-assistants (website/trunk/about/en)
by Roger Dingledine 01 Dec '11

01 Dec '11

Author: arma Date: 2011-12-01 04:51:48 +0000 (Thu, 01 Dec 2011) New Revision: 25239 Modified: website/trunk/about/en/torusers.wml Log: fix typo reported on tor-assistants Modified: website/trunk/about/en/torusers.wml =================================================================== --- website/trunk/about/en/torusers.wml 2011-11-30 18:16:28 UTC (rev 25238) +++ website/trunk/about/en/torusers.wml 2011-12-01 04:51:48 UTC (rev 25239) @@ -297,7 +297,7 @@ <li>To bypass their own security systems for sensitive professional activities: For instance, a company may have a strict policy regarding the material employees can view on the internet. A log review reveals a possible violation. Tor can be used to verify the information without an exception being put into corporate security systems.</li> <li>To connect back to deployed services: A network engineer can use Tor to remotely connect back to services, without the need for an external machine and user account, as part of operational testing.</li> <li>To access internet resources: Acceptable use policy for IT Staff and normal employees is usually different. Tor can allow unfettered access to the internet while leaving standard security policies in place.</li> - <li>To work around ISP network outages: Sometimes when an ISP is having routing or DNS problems, Tor can make internet resources available, when the actual ISP is malfunctioning. This can be invaluable is crisis situations. </li> + <li>To work around ISP network outages: Sometimes when an ISP is having routing or DNS problems, Tor can make internet resources available, when the actual ISP is malfunctioning. This can be invaluable in crisis situations. </li> </ul>

1 0