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

[ooni-probe/master] OSX Homebrew formula to install
by art＠torproject.org 03 Apr '15

03 Apr '15

commit 1365444f753c4d8f6c3cc119e6d3f599302d0053 Author: Alexandre Espinosa Menor <aemenor(a)gmail.com> Date: Fri Apr 3 11:27:55 2015 +0200 OSX Homebrew formula to install --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index c2dec0a..c160695 100644 --- a/README.rst +++ b/README.rst @@ -129,6 +129,11 @@ without installing it is supported with the following commands:: ./setup-dependencies.sh python setup.py install +OSX +--- + + brew install ooniprobe + Other platforms (with Vagrant) ------------------------------

1 0

[ooni-probe/master] Merge pull request #384 from alexandregz/patch-1
by art＠torproject.org 03 Apr '15

03 Apr '15

commit 3be6f855aea0ad4617dd9ffd977a2e4e23b723c7 Merge: 965d782 1365444 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 3 12:06:03 2015 +0200 Merge pull request #384 from alexandregz/patch-1 OSX Homebrew formula to install README.rst | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[ooni-probe/master] Update install instruction for ooniprobe on homebrew
by art＠torproject.org 03 Apr '15

03 Apr '15

commit bc82574a40dcf47f26f2be7cb81dd084b24e3eea Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 3 12:08:00 2015 +0200 Update install instruction for ooniprobe on homebrew --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index c160695..f4ce39f 100644 --- a/README.rst +++ b/README.rst @@ -132,6 +132,8 @@ without installing it is supported with the following commands:: OSX --- +You can install ooniprobe on OSX if you have installed homebrew (http://mxcl.github.io/homebrew) with:: + brew install ooniprobe

1 0

[ooni-probe/master] update ooniprobe to v1.3.1
by art＠torproject.org 03 Apr '15

03 Apr '15

commit 4fe2884b80fb91934e517f1a126fe75020f229f9 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Apr 3 15:05:00 2015 +0200 update ooniprobe to v1.3.1 --- ChangeLog.rst | 11 +++++++++++ ooni/__init__.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 278a5ac..d3a7729 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,17 @@ Changelog ========= +v1.3.1 (Fri, 3 Apr 2015) +------------------------ + +* Fix bug with --help of oonireport + +* Read the home directory from an environement variable + +* Expose the inputs_dir and decks_dir from the config file + +* Fix bug that leads to some incomplete reports not showing up with oonireport + v1.3.0 (Fri, 27 Mar 2015) ------------------------- diff --git a/ooni/__init__.py b/ooni/__init__.py index 8566411..1bc0cb8 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.3.0" +__version__ = "1.3.1" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Fix missing import in oonireport
by art＠torproject.org 03 Apr '15

03 Apr '15

commit cc58416faa0dd62bb6de76e62940daa09cc68c4c Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Apr 2 19:19:37 2015 +0200 Fix missing import in oonireport --- bin/oonireport | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/oonireport b/bin/oonireport index 38fd5a7..1335a83 100755 --- a/bin/oonireport +++ b/bin/oonireport @@ -1,5 +1,6 @@ #!/usr/bin/env python import sys +import exceptions from twisted.internet import defer, reactor from ooni.utils import log

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Apr '15

03 Apr '15

commit 946e2ff8720726e7026b90d430f40a3c79b85b28 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 3 12:45:19 2015 +0000 Update translations for https_everywhere_completed --- nn/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 45643ae..4ea6c3b 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -8,12 +8,14 @@ <!ENTITY https-everywhere.about.contribute "Om du likar HTTPS Everywhere, kunne du kanskje vurdere å "> <!ENTITY https-everywhere.about.donate_tor "Donere til Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.or "eller"> <!ENTITY https-everywhere.about.donate_eff "Donerer til EFF"> <!ENTITY https-everywhere.menu.about "Om HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Innstillingar"> <!ENTITY https-everywhere.menu.globalEnable "Slå på HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Slå av HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockHttpRequests "Blokker alle HTTP-førespurnadar"> <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Apr '15

03 Apr '15

commit 253ccf3a279723662db9379528520b2e27bcd317 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 3 12:45:14 2015 +0000 Update translations for https_everywhere --- nn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index e59e853..4ea6c3b 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL Observatory Innstillingar"> <!ENTITY https-everywhere.menu.globalEnable "Slå på HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Slå av HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> +<!ENTITY https-everywhere.menu.blockHttpRequests "Blokker alle HTTP-førespurnadar"> <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Innstillingar">

1 0

[obfs4/master] Add support for tor feature #15435.
by yawning＠torproject.org 03 Apr '15

03 Apr '15

commit 402fe97d8547d216746d2237010f32b691cb71e1 Author: Yawning Angel <yawning(a)torproject.org> Date: Sat Mar 28 03:09:17 2015 +0000 Add support for tor feature #15435. If the relevant enviornment variable is set, treat read errors from Stdin as a SIGTERM. --- ChangeLog | 1 + obfs4proxy/pt_extras.go | 6 +++++ obfs4proxy/termmon.go | 56 +++++++++++++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e77d16..ce868b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Changes in version 0.0.5 - UNRELEASED: - Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan. - Changed the go.net import path to the new location (golang.org/x/net) - Added limited support for detecting if the parent process crashes. + - Support for tor feature #15335 (stdin based termination notification). Changes in version 0.0.4 - 2015-02-17 - Improve the runtime performance of the obfs4 handshake tests. diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go index 9eddd26..f490fbc 100644 --- a/obfs4proxy/pt_extras.go +++ b/obfs4proxy/pt_extras.go @@ -158,3 +158,9 @@ func resolveAddrStr(addrStr string) (*net.TCPAddr, error) { return &net.TCPAddr{IP: ip, Port: int(port), Zone: ""}, nil } + +// Feature #15435 adds a new env var for determining if Tor keeps stdin +// open for use in termination detection. +func ptShouldExitOnStdinClose() bool { + return os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" +} diff --git a/obfs4proxy/termmon.go b/obfs4proxy/termmon.go index eac7e20..186293c 100644 --- a/obfs4proxy/termmon.go +++ b/obfs4proxy/termmon.go @@ -28,6 +28,8 @@ package main import ( + "io" + "io/ioutil" "os" "os/signal" "runtime" @@ -68,6 +70,17 @@ func (m *termMonitor) wait(termOnNoHandlers bool) os.Signal { } } +func (m *termMonitor) termOnStdinClose() { + _, err := io.Copy(ioutil.Discard, os.Stdin) + + // io.Copy() will return a nil on EOF, since reaching EOF is + // expected behavior. No matter what, if this unblocks, assume + // that stdin is closed, and treat that as having received a + // SIGTERM. + noticef("Stdin is closed or unreadable: %v", err) + m.sigChan <- syscall.SIGTERM +} + func (m *termMonitor) termOnPPIDChange(ppid int) { // Under most if not all U*IX systems, the parent PID will change // to that of init once the parent dies. There are several notable @@ -77,7 +90,6 @@ func (m *termMonitor) termOnPPIDChange(ppid int) { // Naturally we lose if the parent has died by the time when the // Getppid() call was issued in our parent, but, this is better // than nothing. - const ppidPollInterval = 1 * time.Second for ppid == os.Getppid() { time.Sleep(ppidPollInterval) @@ -89,31 +101,33 @@ func (m *termMonitor) termOnPPIDChange(ppid int) { m.sigChan <- syscall.SIGTERM } -func newTermMonitor() *termMonitor { +func newTermMonitor() (m *termMonitor) { ppid := os.Getppid() - m := new(termMonitor) + m = new(termMonitor) m.sigChan = make(chan os.Signal) m.handlerChan = make(chan int) signal.Notify(m.sigChan, syscall.SIGINT, syscall.SIGTERM) - // Until #15435 is implemented, there is no reliable way to see if - // the parent has died that is portable/platform independent/reliable. - // - // Do the next best thing and use various kludges and hacks: - // * Linux - Platform specific code that should always work. - // * Other U*IX - Somewhat generic code, that works unless the parent - // dies before the monitor is initialized. - // * Windows - Don't specifically monitor for parent termination. - if termMonitorOSInit != nil { - // Errors here are non-fatal, since it might still be possible - // to fall back to a generic implementation. - if err := termMonitorOSInit(m); err == nil { - return m + // If tor supports feature #15435, we can use Stdin being closed as an + // indication that tor has died, or wants the PT to shutdown for any + // reason. + if ptShouldExitOnStdinClose() { + go m.termOnStdinClose() + } else { + // Instead of feature #15435, use various kludges and hacks: + // * Linux - Platform specific code that should always work. + // * Other U*IX - Somewhat generic code, that works unless the + // parent dies before the monitor is initialized. + if termMonitorOSInit != nil { + // Errors here are non-fatal, since it might still be + // possible to fall back to a generic implementation. + if err := termMonitorOSInit(m); err == nil { + return + } + } + if runtime.GOOS != "windows" { + go m.termOnPPIDChange(ppid) } } - if runtime.GOOS != "windows" { - go m.termOnPPIDChange(ppid) - } - - return m + return }

1 0

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

03 Apr '15

commit 00eaf97272afc8f942241815d24be24aabc7ba9e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 3 01:45:08 2015 +0000 Update translations for torcheck --- es_MX/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es_MX/torcheck.po b/es_MX/torcheck.po index 83111d2..e796d26 100644 --- a/es_MX/torcheck.po +++ b/es_MX/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Jacobo Nájera <jacobo(a)gnu.org>, 2015 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 # Sofía Celi Ramos <soficeli0(a)gmail.com>, 2014 # RytVonD <the_lovely_cock(a)hotmail.co.uk>, 2014 @@ -9,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-03 01:20+0000\n" +"Last-Translator: Jacobo Nájera <jacobo(a)gnu.org>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgid "" msgstr "Porfavor dirigite a <a href=\"https://www.torproject.org/\"> el sitio web de Tor</a>para información más extensa acerca de cómo usar Tor de manera segura. Ahora eres libre de navegar por la Internet anónimamente " msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "Hay actualizaciones de seguridad disponibles para Tor Browser." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[depictor/master] Correctly remove files older than the given time period
by tom＠torproject.org 03 Apr '15

03 Apr '15

commit 5f704b845654cb883bdb05460bafa9543d9c4846 Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Apr 2 17:57:43 2015 -0400 Correctly remove files older than the given time period --- website.py | 2 +- write_website.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website.py b/website.py index fa7bb8e..668f6eb 100755 --- a/website.py +++ b/website.py @@ -992,4 +992,4 @@ if __name__ == '__main__': w.write_website(os.path.join(os.path.dirname(__file__), 'out', \ 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html'), True) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) - w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) \ No newline at end of file + w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) diff --git a/write_website.py b/write_website.py index 6fe9089..9346d3e 100755 --- a/write_website.py +++ b/write_website.py @@ -88,10 +88,10 @@ def main(): files = [f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'out'))] for f in files: if f.startswith("consensus-health-"): - f = f.replace("consensus-health-", "").replace(".html", "").replace(".gz", "") - f_time = datetime.datetime.strptime(f, "%Y-%m-%d-%H-%M") + f_time = f.replace("consensus-health-", "").replace(".html", "").replace(".gz", "") + f_time = datetime.datetime.strptime(f_time, "%Y-%m-%d-%H-%M") if (consensus_time - f_time).days > weeks_to_keep * 7: - os.remove(f) + os.remove(os.path.join(os.path.dirname(__file__), 'out', f)) def get_consensuses():

1 0