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

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

07 Feb '12

commit 12a40be14a206152118a030202feff0c2cf2a244 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 23:15:05 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index fff1c52..9ba1fc3 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -11,9 +11,9 @@ <string name="status_activated">أنا متصل بشبكة تور</string> <string name="status_disabled">\"تم إيقاف اوربوت</string> <string name="status_shutting_down">جاري إغلاق اوربوت</string> - <string name="tor_process_starting"></string> - <string name="tor_process_complete"></string> - <string name="tor_process_waiting"></string> + <string name="tor_process_starting">تشغيل برنامج تور...</string> + <string name="tor_process_complete">انتهاء</string> + <string name="tor_process_waiting">انتظار</string> <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string> <string name="menu_home">الصفحة الرئيسية</string> <string name="menu_browse">تصفّح</string> @@ -92,8 +92,8 @@ <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> - <string name="wizard_title_msg"></string> - <string name="wizard_warning_title"></string> + <string name="wizard_title_msg">أوربوت يجلب لك شبكة تور للأندرويد! تور يساعدك للتغلب على حجب المحتوى، فحص الاتصال، و الرقابة و التجسس على الشبكات، و التي تهدد الخصوصية و العلاقات الشخصية و المعلومات السرية. سنقوم الآن بمساعدتك لضبط أوربوت و تور على جهازك.</string> + <string name="wizard_warning_title">تحذير</string> <string name="wizard_warning_msg"></string> <string name="wizard_permissions_title"></string> <string name="wizard_permissions_root_msg1"></string> @@ -107,20 +107,20 @@ <string name="wizard_transproxy_title"></string> <string name="wizard_transproxy_msg"></string> <string name="wizard_transproxy_hint"></string> - <string name="wizard_transproxy_none"></string> + <string name="wizard_transproxy_none">و لا شيء</string> <string name="pref_transparent_tethering_title"></string> <string name="pref_transparent_tethering_summary"></string> <string name="button_grant_superuser"></string> - <string name="pref_select_apps"></string> + <string name="pref_select_apps">اختر البرامج</string> <string name="pref_select_apps_summary"></string> <string name="pref_node_configuration"></string> <string name="pref_node_configuration_summary"></string> - <string name="pref_entrance_node"></string> + <string name="pref_entrance_node">نقاط الدخول</string> <string name="pref_entrance_node_summary"></string> <string name="pref_entrance_node_dialog"></string> <string name="pref_use_whispercore"></string> <string name="pref_use_whispercore_summary"></string> - <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_title">نوع البروكسي</string> <string name="pref_proxy_type_summary"></string> <string name="pref_proxy_type_dialog"></string> <string name="pref_proxy_host_title"></string> @@ -129,7 +129,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> @@ -139,7 +139,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>

1 0

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

07 Feb '12

commit 42472be87cc5a017ae6b052c13f69b35f8dbc078 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 23:15:03 2012 +0000 Update translations for gettor --- ar/gettor.po | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index b9dcc8e..d0fbdf0 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -8,13 +8,14 @@ # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # <modafar22(a)hotmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. +# Mohammed Al-Doub <voulnet(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: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-20 21:34+0000\n" -"Last-Translator: Ahmad LuvSy <donotplay(a)hotmail.ca>\n" +"PO-Revision-Date: 2012-02-07 23:03+0000\n" +"Last-Translator: Mohammed Al-Doub <voulnet(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" @@ -494,6 +495,8 @@ msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" msgstr "" +"الأسئلة المتكررة\n" +"==========================" #: lib/gettor/i18n.py:241 msgid "What is Tor?"

1 0

[ooni-probe/master] Set usemicrodescriptors 0 to overcome #4013 in 2.3.x
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 966435de71ea7a07b2c62cc90cbaa05a52790a9c Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:29:04 2012 +0100 Set usemicrodescriptors 0 to overcome #4013 in 2.3.x --- refactor/tests/bridget.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 83ff72f..cea0d91 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -42,6 +42,7 @@ class BridgeT(Plugoo): UseBridges 1 bridge %s DataDirectory %s +usemicrodescriptors 0 """ % (socksport, bridge, datadir) try: f = open(randomname, "wb")

1 0

[ooni-probe/master] Set high timeout for job completions
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 6ed48824be116f3616d5973474b78dc6421aeec7 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:05:28 2012 +0100 Set high timeout for job completions --- refactor/plugoo.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 0a41a2c..1540034 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -281,7 +281,7 @@ class Plugoo(): print ret self.report(ret) - def run(self, assets=None, buffer=10, timeout=30): + def run(self, assets=None, buffer=10, timeout=100000): self.logger.info("Starting %s", self.name) jobs = [] if assets:

1 0

[ooni-probe/master] Parametrize timeout in bridge testing
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 82f969df3d46f1dfd8382e5b77f227c25f463845 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:03:40 2012 +0100 Parametrize timeout in bridge testing --- refactor/ooni-probe.conf | 1 + refactor/tests/bridget.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index 75302f8..2e22961 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -51,6 +51,7 @@ keyword_method = http,telnet ### Tor bridge testing tor_bridges = bridgetests.txt +tor_bridges_timeout = 40 [report] file = report.log diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 71d210a..83ff72f 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -54,6 +54,8 @@ DataDirectory %s def connect(self, bridge, timeout=None): if not timeout: + if self.config.tests.tor_bridges_timeout: + self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 615c95a994f3344e3ddbabf9cf0c7785edc61390 Merge: 82f969d 1662e4f Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:04:07 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

1 0

[ooni-probe/master] Update gitignore
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 1662e4f4025227c94912e24040af980154a3564d Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 22:43:49 2012 +0100 Update gitignore --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 5d58673..b1e99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ proxy-lists/ip-cc.txt proxy-lists/ips.txt proxy-lists/italy-dns-ips.txt proxy-lists/italy-http-ips.txt -refactor/assets/*

1 0

[ooni-probe/master] Add assets directory
by art＠torproject.org 07 Feb '12

07 Feb '12

commit f92bfe90bb020e748304f53556d0b692d704113a Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 22:35:20 2012 +0100 Add assets directory --- .gitignore | 1 + refactor/assets/testasset.txt | 8 -------- refactor/assets/testasset2.txt | 8 -------- refactor/plugoo.py | 5 +++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b1e99aa..5d58673 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ proxy-lists/ip-cc.txt proxy-lists/ips.txt proxy-lists/italy-dns-ips.txt proxy-lists/italy-http-ips.txt +refactor/assets/* diff --git a/refactor/assets/testasset.txt b/refactor/assets/testasset.txt deleted file mode 100644 index 274e331..0000000 --- a/refactor/assets/testasset.txt +++ /dev/null @@ -1,8 +0,0 @@ -# This an example ooni-probe asset file. -# The properties of assets are definied with the "#:" syntax -#:name The asset name -#:desc The description of this asset is bla bla bla bla bla -#:tests testa,testb,testc -#:files something.xml,somethingelse.xml -This is the main body of the assets. -bla bla bla \ No newline at end of file diff --git a/refactor/assets/testasset2.txt b/refactor/assets/testasset2.txt deleted file mode 100644 index 71bbabc..0000000 --- a/refactor/assets/testasset2.txt +++ /dev/null @@ -1,8 +0,0 @@ -# This an example ooni-probe asset file. -# The properties of assets are definied with the "#:" syntax -#:name Another asset -#:desc The description of this asset is bla bla1321212 -#:tests testa,testb,testd -#:files something.xml,somethingelse.xml -This is the main body of the assets. -bla bla bla diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 84eef01..0a41a2c 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -102,8 +102,7 @@ class Report: This should be invoked every time you wish to write some data to the reporting system """ - print "Writing report(s)" - self.logger.info("Writing report(s)") + #print "Writing report(s)" dump = "- " + yaml.dump(data) reports = [] @@ -297,6 +296,7 @@ class Plugoo(): gevent.joinall(jobs, timeout=timeout) for job in jobs: #print "JOB VAL: %s" % job.value + self.logger.info("Writing report(s)") self.report(job.value) job.kill() jobs = [] @@ -305,6 +305,7 @@ class Plugoo(): gevent.joinall(jobs, timeout=timeout) for job in jobs: #print "JOB VAL: %s" % job.value + self.logger.info("Writing report(s)") self.report(job.value) job.kill() jobs = []

1 0

[ooni-probe/master] Make output a bit more pretty
by art＠torproject.org 07 Feb '12

07 Feb '12

commit f2e0c7d3ad1c3aaf10c741655fb3c0b9d1daed43 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 22:26:37 2012 +0100 Make output a bit more pretty --- refactor/plugoo.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 9162050..84eef01 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -120,7 +120,7 @@ class Report: gevent.joinall(jobs) ret = [] for job in jobs: - print job.value + #print job.value ret.append(job.value) return ret @@ -216,7 +216,8 @@ class Report: """This sends the report using the specified type. """ - print "Reporting %s to %s" % (data, type) + #print "Reporting %s to %s" % (data, type) + self.logger.info("Reporting to %s" % type) getattr(self, type+"_report").__call__(data) class Plugoo(): @@ -295,7 +296,7 @@ class Plugoo(): # Run the jobs with the selected timeout gevent.joinall(jobs, timeout=timeout) for job in jobs: - print "JOB VAL: %s" % job.value + #print "JOB VAL: %s" % job.value self.report(job.value) job.kill() jobs = [] @@ -303,7 +304,7 @@ class Plugoo(): if len(jobs) > 0: gevent.joinall(jobs, timeout=timeout) for job in jobs: - print job.value + #print "JOB VAL: %s" % job.value self.report(job.value) job.kill() jobs = []

1 0

[ooni-probe/master] Add conditional import for scapy
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 13c7ba31fe59ee00df271e690b931a2f80944060 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 22:18:45 2012 +0100 Add conditional import for scapy --- refactor/tests/traceroute.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/refactor/tests/traceroute.py b/refactor/tests/traceroute.py index 69f87e5..d7e722a 100644 --- a/refactor/tests/traceroute.py +++ b/refactor/tests/traceroute.py @@ -1,11 +1,15 @@ try: from dns import resolver except: - print "Error dnspython is not installed (http://www.dnspython.org/)" + print "Error: dnspython is not installed (http://www.dnspython.org/)" import gevent import os import plugoo -import scapy + +try: + import scapy +except: + print "Error: traceroute plugin requires scapy to be installed (http://www.secdev.org/projects/scapy)" from plugoo import Plugoo, Asset

1 0