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

[ooni-probe/master] Merge pull request #362 from TheTorProject/fix/unassigned_variable
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 8af0c79d44b035d46a65e24abbad3a68969b2eec Merge: f3bfa7d 3c864e7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Nov 3 15:07:29 2014 +0100 Merge pull request #362 from TheTorProject/fix/unassigned_variable Fix unassigned variable use ooni/api/spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Merge pull request #363 from TheTorProject/fix/remove_unused_imports
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 747ce5dc6215eb05806896afdde77d7bb78ef7e4 Merge: 8af0c79 7973c09 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Nov 3 15:45:50 2014 +0100 Merge pull request #363 from TheTorProject/fix/remove_unused_imports Fix/remove unused imports ooni/kit/daphn3.py | 2 - ooni/kit/domclass.py | 3 - ooni/nettests/blocking/bridge_reachability.py | 3 +- ooni/nettests/experimental/dns_injection.py | 1 - ooni/nettests/experimental/domclass_collector.py | 2 - .../experimental/http_filtering_bypassing.py | 2 +- ooni/nettests/experimental/http_trix.py | 1 - .../experimental/http_uk_mobile_networks.py | 1 - ooni/nettests/experimental/keyword_filtering.py | 2 - ooni/nettests/experimental/parasitictraceroute.py | 1 - ooni/nettests/experimental/squid.py | 1 + ooni/nettests/scanning/http_url_list.py | 1 - ooni/nettests/third_party/netalyzr.py | 2 +- ooni/oonid.py | 5 - ooni/reporter.py | 1 - ooni/tests/disable_test_dns.py | 4 - ooni/tests/test_managers.py | 8 +- ooni/tests/test_oonicli.py | 2 +- ooni/tests/test_reporter.py | 1 - ooni/utils/net.py | 126 -------------------- ooni/utils/txscapy.py | 1 - 21 files changed, 8 insertions(+), 162 deletions(-)

1 0

[ooni-probe/master] Fix key error in dns_consistency
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 30fa38799221bb720a300b0bc91b12cab0e08362 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 5 18:17:54 2014 +0100 Fix key error in dns_consistency --- ooni/nettests/blocking/dns_consistency.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/dns_consistency.py b/ooni/nettests/blocking/dns_consistency.py index 23d7cfc..c4cae56 100644 --- a/ooni/nettests/blocking/dns_consistency.py +++ b/ooni/nettests/blocking/dns_consistency.py @@ -118,7 +118,7 @@ class DNSConsistencyTest(dnst.DNSTest): log.err( "Got no response from control DNS server %s:%d, " "perhaps the DNS resolver is down?" % - self.control_dns_server[0]) + self.control_dns_server) self.report['tampering'][ "%s:%d" % self.control_dns_server] = 'no_answer'

1 0

[onionoo/master] task-14024 log dramatic error message for missing outdir and exit web-server.
by karsten＠torproject.org 03 Jan '15

03 Jan '15

commit b22033332a4441ba3568858aac91f5cd3ba09757 Author: iwakeh <iwakeh(a)users.ourproject.org> Date: Fri Jan 2 19:50:00 2015 +0000 task-14024 log dramatic error message for missing outdir and exit web-server. --- .../java/org/torproject/onionoo/docs/DocumentStore.java | 7 ++++++- .../java/org/torproject/onionoo/server/NodeIndexer.java | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index a880e53..054fe3b 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -10,6 +10,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -45,7 +46,11 @@ public class DocumentStore { private final File statusDir = new File("status"); private File outDir = new File("out"); - public void setOutDir(File outDir) { + public void setOutDir(File outDir) throws FileNotFoundException { + if (!outDir.exists() || !outDir.isDirectory()) { + throw new FileNotFoundException("Cannot access directory " + + outDir); + } this.outDir = outDir; } diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 1a67cc5..64cf3a9 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -1,6 +1,7 @@ package org.torproject.onionoo.server; import java.io.File; +import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -16,6 +17,9 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.SummaryDocument; @@ -25,11 +29,20 @@ import org.torproject.onionoo.util.TimeFactory; public class NodeIndexer implements ServletContextListener, Runnable { + private static final Logger log = LoggerFactory.getLogger( + NodeIndexer.class); + public void contextInitialized(ServletContextEvent contextEvent) { ServletContext servletContext = contextEvent.getServletContext(); File outDir = new File(servletContext.getInitParameter("outDir")); DocumentStore documentStore = DocumentStoreFactory.getDocumentStore(); - documentStore.setOutDir(outDir); + try { + documentStore.setOutDir(outDir); + } catch(FileNotFoundException fnfe) { + log.error("\n\n\tOut-dir not found! Expected directory: " + outDir + + "\n\tVerify the configuration in ./etc/web.xml.template"); + System.exit(1); + } /* The servlet container created us, and we need to avoid that * ApplicationFactory creates another instance of us. */ NodeIndexerFactory.setNodeIndexer(this);

1 0

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

03 Jan '15

commit 761aba21ef19134fe42f0ca9d63d7ca46a0a7397 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 3 03:45:10 2015 +0000 Update translations for torcheck_completed --- cy/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/torcheck.po b/cy/torcheck.po index f84b0fc..1ce242c 100644 --- a/cy/torcheck.po +++ b/cy/torcheck.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-01-03 03:10+0000\n" +"PO-Revision-Date: 2015-01-03 03:20+0000\n" "Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n"

1 0

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

03 Jan '15

commit a763adf5dcf9ef36cdd7d0d866eb2fc699ba179f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 3 03:45:07 2015 +0000 Update translations for torcheck --- cy/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/torcheck.po b/cy/torcheck.po index f84b0fc..1ce242c 100644 --- a/cy/torcheck.po +++ b/cy/torcheck.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-01-03 03:10+0000\n" +"PO-Revision-Date: 2015-01-03 03:20+0000\n" "Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n"

1 0

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

03 Jan '15

commit 13b99db1a5c5fa73551120c587fc9e8aaaa73baf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 3 03:15:29 2015 +0000 Update translations for torcheck_completed --- cy/torcheck.po | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cy/torcheck.po b/cy/torcheck.po index 257641a..f84b0fc 100644 --- a/cy/torcheck.po +++ b/cy/torcheck.po @@ -2,17 +2,18 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2015 # carolyn <carolyn(a)anhalt.org>, 2011 -# Christopher Swift <christopher.swift(a)ubuntu-cym.org>, 2013 +# Christopher Griffiths <transifex(a)cgriff.co.uk>, 2013 # cymro <markives(a)hotmail.co.uk>, 2011 -# huwwaters <huwwaters(a)gmail.com>, 2014 +# Huw Waters <huwwaters(a)gmail.com>, 2014 # littlegreykida <theinfinitygap(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-26 07:51+0000\n" -"Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-03 03:10+0000\n" +"Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,3 +97,6 @@ msgstr "JavaScript wedi ei alluogi." msgid "JavaScript is disabled." msgstr "JavaScript wedi ei analluogi." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Fodd bynnag, nid yw'n ymddangos i fod yn Pecyn Porwr Tor"

1 0

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

03 Jan '15

commit 2b44da26a2af798c7935308e636d3f4d4ff5b248 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 3 03:15:14 2015 +0000 Update translations for torcheck --- cy/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cy/torcheck.po b/cy/torcheck.po index a79c4d8..f84b0fc 100644 --- a/cy/torcheck.po +++ b/cy/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2015 # carolyn <carolyn(a)anhalt.org>, 2011 # Christopher Griffiths <transifex(a)cgriff.co.uk>, 2013 # cymro <markives(a)hotmail.co.uk>, 2011 @@ -11,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-03 03:10+0000\n" +"Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,4 +99,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript wedi ei analluogi." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Fodd bynnag, nid yw'n ymddangos i fod yn Pecyn Porwr Tor"

1 0

[stem/master] Make proc connenction resolution more resilient
by atagar＠torproject.org 02 Jan '15

02 Jan '15

commit 539b6353114e95fa805f55c36562502eec76534e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 2 12:27:02 2015 -0800 Make proc connenction resolution more resilient On busy relays we can fail due to descriptors being dropped in the middle of reading them. This was caught by toralf on... https://trac.torproject.org/projects/tor/ticket/14048 --- docs/change_log.rst | 1 + stem/util/proc.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index cad1f32..3f8a4bc 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -44,6 +44,7 @@ The following are only available within Stem's `git repository * **Utilities** * :func:`stem.util.connection.port_usage` always returned None (:trac:`14046`) + * Proc connection resolution could fail on especially busy systems (:trac:`14048`) .. _version_1.3: diff --git a/stem/util/proc.py b/stem/util/proc.py index c7cb5ce..85585b4 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -365,9 +365,12 @@ def connections(pid): if fd_name.startswith('socket:['): inodes.append(fd_name[8:-1]) - except OSError: + except OSError as exc: + if not os.path.exists(fd_path): + continue # descriptors may shift while we're in the middle of iterating over them + # most likely couldn't be read due to permissions - exc = IOError('unable to determine file descriptor destination: %s' % fd_path) + exc = IOError('unable to determine file descriptor destination (%s): %s' % (exc, fd_path)) _log_failure(parameter, exc) raise exc

1 0

[tor/master] Commit the update-copyrights script.
by nickm＠torproject.org 02 Jan '15

02 Jan '15

commit fc0febc5c62a8c5ad2373b43641a70a8d793a469 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 2 14:28:21 2015 -0500 Commit the update-copyrights script. (I'm tired of rewriting this by hand every January) --- scripts/maint/updateCopyright.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/maint/updateCopyright.pl b/scripts/maint/updateCopyright.pl new file mode 100755 index 0000000..ec82616 --- /dev/null +++ b/scripts/maint/updateCopyright.pl @@ -0,0 +1,7 @@ +#!/usr/bin/perl -i -w -p + +$NEWYEAR=2015; + +s/Copyright(.*) (201[^5]), The Tor Project/Copyright$1 $2-${NEWYEAR}, The Tor Project/; + +s/Copyright(.*)-(20..), The Tor Project/Copyright$1-${NEWYEAR}, The Tor Project/;

1 0