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

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 03 Jan '14

03 Jan '14

commit 3eb6416163b84b18b2790d491fddefd665851631 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 3 21:15:52 2014 +0000 Update translations for torcheck_completed --- ar/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index bbe049b..ed9e187 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-03 20:42+0000\n" +"PO-Revision-Date: 2014-01-03 20:50+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 03 Jan '14

03 Jan '14

commit 579a8574ac318a3866acaf707056869161d5e3de Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 3 21:15:48 2014 +0000 Update translations for torcheck --- ar/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index bbe049b..ed9e187 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-03 20:42+0000\n" +"PO-Revision-Date: 2014-01-03 20:50+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 03 Jan '14

03 Jan '14

commit 8037257addfd3736ae89ce6f09ae7fea27c845d3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 3 20:45:51 2014 +0000 Update translations for torcheck_completed --- ar/torcheck.po | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index e31ac48..bbe049b 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -1,17 +1,17 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # OsamaK <osamak(a)gnu.org>, 2011 -# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 +# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-03 20:42+0000\n" +"Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,8 +20,8 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "تهانينا. متصفحك مضبوط لاستخدام تور." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "تهانينا. متصفحك مضبوط لأستخدام تور." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -57,3 +57,41 @@ msgstr "خطأ مؤقت بالخدمة يمنعنا من تحديد إذا كا msgid "Your IP address appears to be: " msgstr "عنوان الانترنت الخاص بك يظهر كالتالي:" + +msgid "Are you using Tor?" +msgstr "هل تستخدم تور؟" + +msgid "This page is also available in the following languages:" +msgstr "هذه الصفحة ايضًا متوفرة باللغات التالية:" + +msgid "For more information about this exit relay, see:" +msgstr "لمزيد من المعلومات عن المُرحل الاخير المستخدم حاليًا:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "مشروع تور هو US 501(c)(3) غير ربحي مُكرس للبحث، و التطوير، و التوعية بإخفاء الهوية والخصوصية." + +msgid "Learn More »" +msgstr "تعرف على المزيد »" + +msgid "Go" +msgstr "اذهب" + +msgid "Short User Manual" +msgstr "دليل المستخدم القصير" + +msgid "Donate to Support Tor" +msgstr "تبرع لدعم تور" + +msgid "Tor Q&A Site" +msgstr "موقع تور للأسئلة و الاجوبة" + +msgid "Volunteer" +msgstr "تطوع" + +msgid "JavaScript is enabled." +msgstr "چاڨا سكريپت مفعلة" + +msgid "JavaScript is disabled." +msgstr "چاڨا سكريپت معطلة"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 03 Jan '14

03 Jan '14

commit 3c8d412f25eab64270266c7eeed1cb4b5464d6fb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 3 20:45:47 2014 +0000 Update translations for torcheck --- ar/torcheck.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index 84fbfc4..bbe049b 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -5,13 +5,13 @@ # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # OsamaK <osamak(a)gnu.org>, 2011 -# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 +# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-03 20:42+0000\n" +"Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,25 +73,25 @@ msgid "" msgstr "مشروع تور هو US 501(c)(3) غير ربحي مُكرس للبحث، و التطوير، و التوعية بإخفاء الهوية والخصوصية." msgid "Learn More »" -msgstr "" +msgstr "تعرف على المزيد »" msgid "Go" -msgstr "" +msgstr "اذهب" msgid "Short User Manual" -msgstr "" +msgstr "دليل المستخدم القصير" msgid "Donate to Support Tor" -msgstr "" +msgstr "تبرع لدعم تور" msgid "Tor Q&A Site" -msgstr "" +msgstr "موقع تور للأسئلة و الاجوبة" msgid "Volunteer" -msgstr "" +msgstr "تطوع" msgid "JavaScript is enabled." -msgstr "" +msgstr "چاڨا سكريپت مفعلة" msgid "JavaScript is disabled." -msgstr "" +msgstr "چاڨا سكريپت معطلة"

1 0

[tor/master] Add explicit check for 0-length extend2 cells
by nickm＠torproject.org 03 Jan '14

03 Jan '14

commit 90303602773eca8505229c832119dafcbcfe1ab7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 3 10:43:09 2014 -0500 Add explicit check for 0-length extend2 cells This is harmless in the Tor of today, but important for correctness. Fixes bug 10536; bugfix on 0.2.4.8-alpha. Reported by "cypherpunks". --- changes/bug10536 | 6 ++++++ src/or/onion.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug10536 b/changes/bug10536 new file mode 100644 index 0000000..e15da7c --- /dev/null +++ b/changes/bug10536 @@ -0,0 +1,6 @@ + + o Minor bugfixes: + - Reject 0-lenth EXTEND2 cells more expicitly. Previously our code would + reject them a bit later than it should have. This bug is + harmless. Fixes bug 10536; bugfix on 0.2.4.8-alpha. Reported by + "cypherpunks". diff --git a/src/or/onion.c b/src/or/onion.c index 3e1d63d..30b983d 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -860,14 +860,17 @@ extend_cell_parse(extend_cell_t *cell_out, const uint8_t command, } case RELAY_COMMAND_EXTEND2: { - uint8_t n_specs = *payload, spectype, speclen; + uint8_t n_specs, spectype, speclen; int i; int found_ipv4 = 0, found_ipv6 = 0, found_id = 0; tor_addr_make_unspec(&cell_out->orport_ipv4.addr); tor_addr_make_unspec(&cell_out->orport_ipv6.addr); + if (payload_length == 0) + return -1; + cell_out->cell_type = RELAY_COMMAND_EXTEND2; - ++payload; + n_specs = *payload++; /* Parse the specifiers. We'll only take the first IPv4 and first IPv6 * address, and the node ID, and ignore everything else */ for (i = 0; i < n_specs; ++i) {

1 0

[ooni-probe/master] Use generic L3RawSocket rather than OS specific L3PacketSocket
by art＠torproject.org 03 Jan '14

03 Jan '14

commit faec3c8cf6f319e5ec6257637ccad5b4de78b78a Author: aagbsn <aagbsn(a)extc.org> Date: Fri Oct 18 12:32:19 2013 +0000 Use generic L3RawSocket rather than OS specific L3PacketSocket Experimental: Seems to work in tests, but has not yet been tested on any platform other than Linux. Solves the problem reported in https://github.com/TheTorProject/ooni-probe/issues/214 --- ooni/utils/txscapy.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index a5bb841..bcb0ca2 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -10,6 +10,7 @@ from twisted.internet import defer, abstract from zope.interface import implements from scapy.config import conf +from scapy.supersocket import L3RawSocket from ooni.utils import log from ooni.settings import config @@ -129,9 +130,7 @@ class ScapyFactory(abstract.FileDescriptor): if interface == 'auto': interface = getDefaultIface() if not super_socket: - super_socket = conf.L3socket(iface=interface, - promisc=True, filter='') - #super_socket = conf.L2socket(iface=interface) + super_socket = L3RawSocket(iface=interface, promisc=True) self.protocols = [] fdesc._setCloseOnExec(super_socket.ins.fileno())

1 0

[ooni-probe/master] Change how we compute the test ID
by art＠torproject.org 03 Jan '14

03 Jan '14

commit 957a83347271db809341f9e341d79d3ebeb81e30 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 26 21:46:40 2013 +0100 Change how we compute the test ID --- ooni/nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index b421252..7e1ef04 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -160,7 +160,7 @@ def getNetTestInformation(net_test_file): """ test_class = getTestClassFromFile(net_test_file) - test_id = test_class_name_to_name(test_class.name) + test_id = os.path.basename(net_test_file).replace('.py', '') information = {'id': test_id, 'name': test_class.name, 'description': test_class.description,

1 0

[ooni-probe/master] Only print what we are actually doing.
by art＠torproject.org 03 Jan '14

03 Jan '14

commit e3aab12ae94720c3be96e8152c4ba13f957cdf69 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 26 21:36:04 2013 +0100 Only print what we are actually doing. --- ooni/director.py | 3 ++- ooni/oonicli.py | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 46dd962..05344af 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -122,7 +122,6 @@ class Director(object): self.netTests = self.getNetTests() if config.advanced.start_tor: - log.msg("Starting Tor...") yield self.startTor() config.probe_ip = geoip.ProbeIP() @@ -264,6 +263,8 @@ class Director(object): Launches a Tor with :param: socks_port :param: control_port :param: tor_binary set in ooniprobe.conf """ + log.msg("Starting Tor...") + @defer.inlineCallbacks def state_complete(state): config.tor_state = state diff --git a/ooni/oonicli.py b/ooni/oonicli.py index c5e7c53..9405044 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -122,15 +122,10 @@ def runWithDirector(): " See ooniprobe.conf privacy.includepcap") sys.exit(2) - # contains (test_cases, options, cmd_line_options) - test_list = [] - director = Director() - d = director.start() - if global_options['list']: print "# Installed nettests" - for net_test_id, net_test in director.netTests.items(): + for net_test_id, net_test in director.getNetTests().items(): print "* %s (%s/%s)" % (net_test['name'], net_test['category'], net_test['id']) @@ -138,6 +133,8 @@ def runWithDirector(): sys.exit(0) + d = director.start() + #XXX: This should mean no bouncer either! if global_options['no-collector']: log.msg("Not reporting using a collector")

1 0

[ooni-probe/master] Fix bug in vagrantfile
by art＠torproject.org 03 Jan '14

03 Jan '14

commit 4ab74177230d646131e8dda125d6fb7cf5a540f8 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 27 12:18:55 2013 +0100 Fix bug in vagrantfile --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 76ce70c..a4e9fbe 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -25,7 +25,7 @@ make geoip 2>&1 > /dev/null mkdir -p ~/.ooni cp /usr/share/ooni/ooniprobe.conf.sample ~/.ooni/ooniprobe.conf -cd /ooni/inputs/ +cd /usr/share/ooni/inputs make lists 2>&1 > /dev/null # https://code.google.com/p/pypcap/issues/detail?id=27

1 0

[ooni-probe/master] Clean up the output of ooni-probe
by art＠torproject.org 03 Jan '14

03 Jan '14

commit bcd06c044bfbfb1d0191670088549c9f23e1a9d8 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 27 12:16:57 2013 +0100 Clean up the output of ooni-probe --- ooni/director.py | 2 +- ooni/managers.py | 1 - ooni/reporter.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 05344af..4c53ca6 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -175,7 +175,7 @@ class Director(object): self.totalMeasurements += 1 def measurementSucceeded(self, result, measurement): - log.msg("Successfully completed measurement: %s" % measurement) + log.debug("Successfully completed measurement: %s" % measurement) self.totalMeasurementRuntime += measurement.runtime self.successfulMeasurements += 1 measurement.result = result diff --git a/ooni/managers.py b/ooni/managers.py index b6e87e4..348343f 100644 --- a/ooni/managers.py +++ b/ooni/managers.py @@ -30,7 +30,6 @@ class TaskManager(object): to be re-run once all the currently scheduled tasks have run. """ log.err("Task %s has failed %s times" % (task, task.failures)) - log.exception(failure) self._active_tasks.remove(task) self.failures = self.failures + 1 diff --git a/ooni/reporter.py b/ooni/reporter.py index d90c259..545997d 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -364,7 +364,7 @@ class OONIBReporter(OReporter): try: parsed_response = json.loads(backend_response) except Exception, e: - log.err("Failed to parse collector response") + log.err("Failed to parse collector response %s" % backend_response) log.exception(e) raise errors.OONIBReportCreationError

1 0