- tor-commits - lists.torproject.org

[ooni-probe/master] Fix bug in timeout
by art＠torproject.org 07 Feb '12

07 Feb '12

commit f0b2a98744d8f098632721648adf6ea40c9489ca Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:24:19 2012 +0100 Fix bug in timeout --- refactor/tests/bridget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 9ec499f..71d210a 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,7 +52,7 @@ DataDirectory %s os.mkdir(datadir) return (randomname, datadir) - def connect(self, bridge, timeout): + def connect(self, bridge, timeout=None): if not timeout: timeout = self.timeout torrc, tordir = self.writetorrc(bridge)

1 0

[ooni-probe/master] Fix bug in bridget
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 3ad40791278a53e95d7f327f64a075c77a3a0794 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:22:48 2012 +0100 Fix bug in bridget --- refactor/tests/bridget.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index c3d0055..9ec499f 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,7 +52,9 @@ DataDirectory %s os.mkdir(datadir) return (randomname, datadir) - def connect(self, bridge, timeout=self.timeout): + def connect(self, bridge, timeout): + if not timeout: + timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

[ooni-probe/master] Add UTF-8 charset to files
by art＠torproject.org 07 Feb '12

07 Feb '12

commit dfd6f74c2d52d2a073ec23b405bf19039848d465 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:20:18 2012 +0100 Add UTF-8 charset to files --- refactor/ooni-probe.py | 3 ++- refactor/plugoo.py | 1 + refactor/tests/bridget.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/refactor/ooni-probe.py b/refactor/ooni-probe.py index bb67256..64d35f5 100644 --- a/refactor/ooni-probe.py +++ b/refactor/ooni-probe.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 #!/usr/bin/env python """ ooni-probe @@ -11,7 +12,7 @@ The goal of ooni-probe is to collect data about censorship around the world. - :copyright: (c) 2012 by Arturo Filastò. + :copyright: (c) 2012 by Arturo Filastò :license: see LICENSE for more details. """ diff --git a/refactor/plugoo.py b/refactor/plugoo.py index ee3ee0f..7606382 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 """ plugoo ****** diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 886b7a6..c3d0055 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 """ bridgeT ******* @@ -5,7 +6,7 @@ an OONI test (we call them Plugoos :P) aimed at detecting if a set of Tor bridges are working or not. - :copyright: (c) 2012 by Arturo Filastò. + :copyright: (c) 2012 by Arturo Filastò :license: BSD, see LICENSE for more details. """ import os

1 0

r25377: {website} tell people to fetch tor from git in a more secure way (website/trunk/docs/en)
by Roger Dingledine 07 Feb '12

07 Feb '12

Author: arma Date: 2012-02-07 14:37:07 +0000 (Tue, 07 Feb 2012) New Revision: 25377 Modified: website/trunk/docs/en/documentation.wml Log: tell people to fetch tor from git in a more secure way Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-02-06 22:41:19 UTC (rev 25376) +++ website/trunk/docs/en/documentation.wml 2012-02-07 14:37:07 UTC (rev 25377) @@ -266,7 +266,7 @@ <li><a href="<gitrepo>">Browse the repository's source tree directly</a></li> <li>Git and SVN access: <ul> - <li><kbd>git clone git://git.torproject.org/git/tor</kbd></li> + <li><kbd>git clone https://git.torproject.org/git/tor</kbd></li> <li>The development branch is <kbd>master</kbd>. The active maintenance branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>.</li> <li><kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd></li> </ul>

1 0

[metrics-web/master] Don't conceal Java warnings in Ant's output.
by karsten＠torproject.org 07 Feb '12

07 Feb '12

commit 00c4cc35bbfd01e1f6e06b85c147e54cf726f529 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 7 12:55:20 2012 +0100 Don't conceal Java warnings in Ant's output. --- run.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/run.sh b/run.sh index e804876..f8ac867 100755 --- a/run.sh +++ b/run.sh @@ -1,5 +1,5 @@ #!/bin/sh # TODO is there a better way to suppress Ant's output? -ant -q | grep -Ev "^$|^BUILD SUCCESSFUL|^Total time: " +ant | grep "\[java\]"

1 0

[metrics-web/master] Warn if torperf data has become stale.
by karsten＠torproject.org 07 Feb '12

07 Feb '12

commit 0002fa2b7e7c180dd4fa3c3ffa949964333e93b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 7 13:05:07 2012 +0100 Warn if torperf data has become stale. In theory, this check belongs in metrics-db, not metrics-web. But it's already implemented here, and raising a log level is easier than copying and maintaining the code. As soon as metrics-db uses metrics-lib this is all going to be so much easier... --- .../torproject/ernie/cron/TorperfProcessor.java | 27 ++++++++++++++------ 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index 7caccf6..dcd0657 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -22,6 +22,9 @@ public class TorperfProcessor { SortedMap<String, String> rawObs = new TreeMap<String, String>(); SortedMap<String, String> stats = new TreeMap<String, String>(); int addedRawObs = 0; + SimpleDateFormat formatter = + new SimpleDateFormat("yyyy-MM-dd,HH:mm:ss"); + formatter.setTimeZone(TimeZone.getTimeZone("UTC")); try { if (rawFile.exists()) { logger.fine("Reading file " + rawFile.getAbsolutePath() + "..."); @@ -80,9 +83,6 @@ public class TorperfProcessor { size.length() - "xb.data".length())); BufferedReader br = new BufferedReader(new FileReader(pop)); String line = null; - SimpleDateFormat formatter = - new SimpleDateFormat("yyyy-MM-dd,HH:mm:ss"); - formatter.setTimeZone(TimeZone.getTimeZone("UTC")); while ((line = br.readLine()) != null) { String[] parts = line.split(" "); // remove defective lines as they occurred on gabelmoo @@ -230,22 +230,33 @@ public class TorperfProcessor { + "Last known obserations by source and file size are:"); String lastSource = null; String lastLine = null; + Level logLevel = Level.INFO; + String cutoff = formatter.format(System.currentTimeMillis() + - 12L * 60L * 60L * 1000L).replaceAll(",", " "); for (String s : rawObs.keySet()) { String[] parts = s.split(","); if (lastSource == null) { lastSource = parts[0]; } else if (!parts[0].equals(lastSource)) { - dumpStats.append("\n" + lastSource + " " + lastLine.split(",")[1] - + " " + lastLine.split(",")[2]); + String lastKnownObservation = lastLine.split(",")[1] + " " + + lastLine.split(",")[2]; + dumpStats.append("\n" + lastSource + " " + lastKnownObservation); lastSource = parts[0]; + if (cutoff.compareTo(lastKnownObservation) > 0) { + logLevel = Level.WARNING; + } } lastLine = s; } if (lastSource != null) { - dumpStats.append("\n" + lastSource + " " + lastLine.split(",")[1] - + " " + lastLine.split(",")[2]); + String lastKnownObservation = lastLine.split(",")[1] + " " + + lastLine.split(",")[2]; + dumpStats.append("\n" + lastSource + " " + lastKnownObservation); + if (cutoff.compareTo(lastKnownObservation) > 0) { + logLevel = Level.WARNING; + } } - logger.info(dumpStats.toString()); + logger.log(logLevel, dumpStats.toString()); /* Write results to database. */ if (connectionURL != null) {

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Feb '12

07 Feb '12

commit 94724716e2864c2f58384297aadc27220b530cda Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 11:15:21 2012 +0000 Update translations for vidalia_help --- zh_CN/links.po | 12 ++++++++---- zh_CN/server.po | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/zh_CN/links.po b/zh_CN/links.po index 0b7b5b2..b9c8b35 100644 --- a/zh_CN/links.po +++ b/zh_CN/links.po @@ -1,13 +1,14 @@ # # Translators: +# <hua5679(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-02-07 11:05+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,12 +48,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki和Bug跟踪" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 @@ -75,10 +76,13 @@ msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" msgstr "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" +"<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" diff --git a/zh_CN/server.po b/zh_CN/server.po index cbfe541..bfee5c8 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -7,7 +7,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: 2012-01-14 16:11+0000\n" +"PO-Revision-Date: 2012-02-07 11:06+0000\n" "Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 msgid "Secure Websites (SSL)" -msgstr "" +msgstr "安全网站(SSL)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:149 @@ -299,7 +299,7 @@ msgstr "6660-6669, 6697, 7000-7001" #. type: Content of: <html><body><table><tr><td> #: en/server.html:165 msgid "IRC clients and servers" -msgstr "" +msgstr "IRC客户端和服务器" #. type: Content of: <html><body><table><tr><td> #: en/server.html:168

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 Feb '12

07 Feb '12

commit 1fa4c8321d303c79b15f97e7fe5f056d0751600e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 11:15:04 2012 +0000 Update translations for gettor --- zh_CN/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 21cb605..4dde504 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-14 16:10+0000\n" +"PO-Revision-Date: 2012-02-07 10:54+0000\n" "Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "感谢你的请求。" #: lib/gettor/i18n.py:31 msgid ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Feb '12

07 Feb '12

commit 8c671b702811a7cd634094f7b626d391875081ba Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 10:15:20 2012 +0000 Update translations for vidalia_help --- zh_CN/running.po | 9 +++++---- zh_CN/troubleshooting.po | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index 0e68010..96fb366 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -1,13 +1,14 @@ # # Translators: # chen zhang <magnyfx(a)hotmail.com>, 2011. +# <hua5679(a)gmail.com>, 2012. msgid "" 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: 2011-09-27 09:09+0000\n" -"Last-Translator: magny <magnyfx(a)hotmail.com>\n" +"PO-Revision-Date: 2012-02-07 10:07+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +59,7 @@ msgstr "." msgid "" "Vidalia's tray icon will change from an onion with a red X to a green onion " "when Tor has started." -msgstr "" +msgstr "当Tor开启时，Vidalia在系统托盘上的图标会从有X的红色洋葱变成绿色洋葱。" #. type: Content of: <html><body><p> #: en/running.html:36 @@ -117,7 +118,7 @@ msgstr "" #: en/running.html:69 msgid "" "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor." -msgstr "" +msgstr "Tor处于停止状态。选择Vidalia菜单上的 <i>开始</i> 来开启Tor。" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:76 diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index d07ac05..294a85d 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -1,13 +1,14 @@ # # Translators: +# <hua5679(a)gmail.com>, 2012. # jhk <j_hk001(a)126.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2011-03-22 16:45+0000\n" -"Last-Translator: jhk <j_hk001(a)126.com>\n" +"PO-Revision-Date: 2012-02-07 10:00+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +72,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 msgid "Vidalia Can't Connect to Tor" -msgstr "" +msgstr "Vidalia不能连接到Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:46 @@ -237,7 +238,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:148 msgid "Vidalia Can't Stop Tor" -msgstr "" +msgstr "Vidalia不能停止Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:150

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 07 Feb '12

07 Feb '12

commit cf58c67489ccc21ee05165a7f693c6260e85b58d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 10:15:03 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 62704fb..b260e9b 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -11,7 +11,7 @@ <string name="status_activated">已连接到 Tor 网络</string> <string name="status_disabled">Orbot 已停用</string> <string name="status_shutting_down">Orbot 正在关闭</string> - <string name="tor_process_starting"></string> + <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> @@ -122,7 +122,7 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> - <string name="status"></string> + <string name="status">状态</string> <string name="setting_up_full_transparent_proxying_"></string> <string name="setting_up_app_based_transparent_proxying_"></string> <string name="transparent_proxying_enabled"></string> @@ -132,7 +132,7 @@ <string name="couldn_t_start_tor_process_"></string> <string name="privoxy_is_running_on_port_"></string> <string name="setting_up_port_based_transparent_proxying_"></string> - <string name="bridge_error"></string> + <string name="bridge_error">网桥错误</string> <string name="bridge_requires_ip"></string> <string name="send_email_for_bridges"></string> <string name="error">错误</string> @@ -146,10 +146,10 @@ <string name="enter_exclude_nodes"></string> <string name="strict_nodes"></string> <string name="use_only_these_specified_nodes"></string> - <string name="bridges"></string> - <string name="use_bridges"></string> + <string name="bridges">网桥</string> + <string name="use_bridges">使用网桥</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges"></string> + <string name="ip_address_and_port_of_bridges">网桥的IP地址和端口</string> <string name="enter_bridge_addresses"></string> <string name="relays"></string> <string name="relaying"></string> @@ -172,15 +172,15 @@ <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> <string name="project_home"></string> - <string name="project_urls"></string> - <string name="the_tor_license"></string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">Tor许可证</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software"></string> - <string name="tor_version"></string> + <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version"></string> - <string name="privoxy_version"></string> - <string name="iptables_version"></string> - <string name="openssl_version"></string> + <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> + <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string>

1 0