March 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix parsing of collector key in reports.
by art＠torproject.org 31 Mar '14

31 Mar '14

commit d982fedd0c28c75d545b9265c71d3226827bea6c Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 02:23:52 2014 +0100 Fix parsing of collector key in reports. --- ooni/oonicli.py | 2 +- ooni/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 4fed4c7..7ac1e76 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -232,7 +232,7 @@ def runWithDirector(logging=True, start_tor=True): if … [View More]

1 0

[ooni-probe/master] s/threads/defereds/
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 3cf943a235b1f04491c3933eead95b1e3dc49d8b Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Fri Mar 7 03:03:26 2014 +0530 s/threads/defereds/ --- ooni/nettests/manipulation/captiveportal.py | 53 ++++++++++++++++----------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index 59c6d60..2979120 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/… [View More]nettests/manipulation/captiveportal.py @@ -74,6 +74,7 @@ class CaptivePortal(httpt.HTTPTest): requiresRoot = False requiresTor = False + @defer.inlineCallbacks def http_fetch(self, url, headers={}): """ Parses an HTTP url, fetches it, and returns a response @@ -83,13 +84,13 @@ class CaptivePortal(httpt.HTTPTest): #XXX: HTTP Error 302: The HTTP server returned a redirect error that #would lead to an infinite loop. The last 30x error message was: Found try: - response = threads.blockingCallFromThread(reactor,self.doRequest,url,"GET",headers) - response_headers = response.headers - return response, response_headers - except: + response = yield self.doRequest(url,"GET",headers) + defer.returnValue(response) + except Exception: log.err("HTTPError") - return None, None + defer.returnValue(None) + @defer.inlineCallbacks def http_content_match_fuzzy_opt(self, experimental_url, control_result, headers=None, fuzzy=False): """ @@ -107,13 +108,15 @@ class CaptivePortal(httpt.HTTPTest): default_ua = self.local_options['user-agent'] headers = {'User-Agent': default_ua} - response, response_headers = self.http_fetch(experimental_url, headers) + response = yield self.http_fetch(experimental_url, headers) + response_headers = response.headers response_content = response.body if response else None response_code = response.code if response else None if response_content is None: log.err("HTTP connection appears to have failed.") - return False, False, False + r = (False, False, False) + defer.returnValue(r) if fuzzy: pattern = re.compile(control_result) @@ -122,18 +125,22 @@ class CaptivePortal(httpt.HTTPTest): log.msg("'%s'" % experimental_url) if not match: log.msg("does not match!") - return False, response_code, response_headers + r = (False, response_code, response_headers) + defer.returnValue(r) else: log.msg("and the expected control result yielded a match.") - return True, response_code, response_headers + r = (True, response_code, response_headers) + defer.returnValue(r) else: if str(response_content) != str(control_result): log.msg("HTTP content comparison of experiment URL") log.msg("'%s'" % experimental_url) log.msg("and the expected control result do not match.") - return False, response_code, response_headers + r = (False, response_code, response_headers) + defer.returnValue(r) else: - return True, response_code, response_headers + r = (True, response_code, response_headers) + defer.returnValue(r) def http_status_code_match(self, experiment_code, control_code): """ @@ -480,7 +487,7 @@ class CaptivePortal(httpt.HTTPTest): report['ms_dns_cp'] = self.ms_dns_cp_test() return report - + @defer.inlineCallbacks def run_vendor_tests(self, *a, **kw): """ These are several vendor tests used to detect the presence of @@ -512,23 +519,24 @@ class CaptivePortal(httpt.HTTPTest): sm = self.http_status_code_match snm = self.http_status_code_no_match + @defer.inlineCallbacks def compare_content(status_func, fuzzy, experiment_url, control_result, control_code, headers, test_name): log.msg("") log.msg("Running the %s test..." % test_name) - content_match, experiment_code, experiment_headers = cm(experiment_url, + content_match, experiment_code, experiment_headers = yield cm(experiment_url, control_result, headers, fuzzy) status_match = status_func(experiment_code, control_code) if status_match and content_match: log.msg("The %s test was unable to detect" % test_name) log.msg("a captive portal.") - return True + defer.returnValue(True) else: log.msg("The %s test shows that your network" % test_name) log.msg("is filtered.") - return False + defer.returnValue(False) result = [] for vt in vendor_tests: @@ -544,19 +552,20 @@ class CaptivePortal(httpt.HTTPTest): args = (experiment_url, control_result, control_code, headers, test_name) if test_name == "MS HTTP Captive Portal": - report['result'] = compare_content(sm, False, *args) + report['result'] = yield compare_content(sm, False, *args) elif test_name == "Apple HTTP Captive Portal": - report['result'] = compare_content(sm, True, *args) + report['result'] = yield compare_content(sm, True, *args) elif test_name == "W3 Captive Portal": - report['result'] = compare_content(snm, True, *args) + report['result'] = yield compare_content(snm, True, *args) else: log.err("Ooni is trying to run an undefined CP vendor test.") result.append(report) - return result + defer.returnValue(result) + @defer.inlineCallbacks def control(self, experiment_result, args): """ Compares the content and status code of the HTTP response for @@ -579,7 +588,7 @@ class CaptivePortal(httpt.HTTPTest): snm = self.http_status_code_no_match log.msg("Running test for '%s'..." % experiment_url) - content_match, experiment_code, experiment_headers = cm(experiment_url, + content_match, experiment_code, experiment_headers = yield cm(experiment_url, control_result) status_match = sm(experiment_code, control_code) if status_match and content_match: @@ -591,7 +600,7 @@ class CaptivePortal(httpt.HTTPTest): elif status_match and not content_match: log.msg("Retrying '%s' with fuzzy match enabled." % experiment_url) - fuzzy_match, experiment_code, experiment_headers = cm(experiment_url, + fuzzy_match, experiment_code, experiment_headers = yield cm(experiment_url, control_result, fuzzy=True) if fuzzy_match: @@ -634,7 +643,7 @@ class CaptivePortal(httpt.HTTPTest): log.msg("") log.msg("Running vendor tests...") - self.report['vendor_tests'] = yield threads.deferToThread(self.run_vendor_tests) + self.report['vendor_tests'] = yield self.run_vendor_tests() log.msg("") log.msg("Running vendor DNS-based tests...") [View Less]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 843c3337c74687905812b1ac6988001c35812486 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 03:15:38 2014 +0000 Update translations for tails-misc --- zh_TW.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 2c18ef9..1abd380 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# 修銘張 <… [View More]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 8cbeadf27eeb8c94717853d06a5fe28f7d3dd485 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 03:15:20 2014 +0000 Update translations for tails-persistence-setup --- zh_TW/zh_TW.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index d870447..c189aa3 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,14 +3,15 @@ # This file is distributed under the same … [View More]license as the PACKAGE package. # # Translators: +# 修銘張 <cges30901(a)gmail.com>, 2014 # xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-03-18 05:30+0000\n" -"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-31 03:10+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,7 +77,7 @@ msgstr "網路設備和連線設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "瀏覽器書籤" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" @@ -84,11 +85,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "印表機" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "印表機配置" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" @@ -204,7 +205,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "建立" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -220,16 +221,16 @@ msgstr "密碼：" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "" +msgstr "確認密碼：" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "" +msgstr "密碼不能為空" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "" +msgstr "密碼不相符" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:129 @@ -254,7 +255,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 msgid "Creating..." -msgstr "" +msgstr "建立中..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 msgid "Creating the persistent volume..." @@ -282,7 +283,7 @@ msgstr "儲存" #: ../lib/Tails/Persistence/Step/Configure.pm:143 msgid "Saving..." -msgstr "" +msgstr "儲存中..." #: ../lib/Tails/Persistence/Step/Configure.pm:146 msgid "Saving persistence configuration..." @@ -304,11 +305,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "刪除" #: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." -msgstr "" +msgstr "刪除中..." #: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." [View Less]

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 5350a90bee0a9608ef4fc77f717b4e9e0b5dcf8b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:16:14 2014 +0000 Update translations for tails-iuk_completed --- tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr.po b/tr.po index 997d597..ce9a488 100644 --- a/tr.po +++ b/tr.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "… [View More]

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit e0fc087e99509fb4a731a2a23e71369f5ec1363b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:16:12 2014 +0000 Update translations for tails-iuk --- tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr.po b/tr.po index 997d597..ce9a488 100644 --- a/tr.po +++ b/tr.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-… [View More]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 86b9af2c1efd8097db1de1bb66d4e35e760048b4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:16:08 2014 +0000 Update translations for torbutton-torbuttonproperties --- tr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.properties b/tr/torbutton.properties index 517023b..e7a3b1c 100644 --- a/tr/torbutton.properties +++ b/tr/torbutton.properties @@ -7,7 +7,7 @@ torbutton.panel.plugins.… [View More]

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 20f48e0da64f8b79fd504db0c5801d4a02a5d2b3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:16:00 2014 +0000 Update translations for abouttor-homepage_completed --- tr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index e01e82b..8000e0f 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -15,7 +15,7 @@ <!ENTITY aboutTor.success.label "Tebrikler!"> <!… [View More]ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> <!ENTITY aboutTor.success3.label "Şimdi İnternet'i anonim olarak kullanmakta özgürsünüz!"> -<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış oldu."> +<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış gitti!"> <!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> <!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> @@ -31,7 +31,7 @@ <!ENTITY aboutTor.torInfo3.label "Çıkış düğümü:"> <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler ile ilgili herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Sırada ne var?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı internet alışkanlıklarınızı değiştirmeniz gerekebilir."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> <!ENTITY aboutTor.whatnext.label "Anonim kalmak için püf noktalar »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım edebilirsiniz!"> @@ -44,5 +44,5 @@ <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> -<!ENTITY aboutTor.learnMore.label "Tor projesi hakkında daha çok şey öğrenin »"> +<!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok şey öğrenin »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> [View Less]

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 780b3cba103f0db68b1de082114e911b45f9ebd3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:15:58 2014 +0000 Update translations for abouttor-homepage --- tr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index e01e82b..8000e0f 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -15,7 +15,7 @@ <!ENTITY aboutTor.success.label "Tebrikler!"> <!ENTITY … [View More]aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> <!ENTITY aboutTor.success3.label "Şimdi İnternet'i anonim olarak kullanmakta özgürsünüz!"> -<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış oldu."> +<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış gitti!"> <!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> <!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> @@ -31,7 +31,7 @@ <!ENTITY aboutTor.torInfo3.label "Çıkış düğümü:"> <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler ile ilgili herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Sırada ne var?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı internet alışkanlıklarınızı değiştirmeniz gerekebilir."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> <!ENTITY aboutTor.whatnext.label "Anonim kalmak için püf noktalar »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım edebilirsiniz!"> @@ -44,5 +44,5 @@ <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> -<!ENTITY aboutTor.learnMore.label "Tor projesi hakkında daha çok şey öğrenin »"> +<!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok şey öğrenin »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> [View Less]

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 98f35bebb139e80c6de4f6b9925ded19dd9dc096 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 01:15:56 2014 +0000 Update translations for tails-misc_completed --- tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr.po b/tr.po index e5ab36e..14bcf83 100644 --- a/tr.po +++ b/tr.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\… [View More]

1 0