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

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

18 Oct '14

commit e8313ff2c0c69a6f326fb09adfb3942e5486149a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 18 00:46:12 2014 +0000 Update translations for tails-misc --- it.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/it.po b/it.po index 94245f6..bf49f32 100644 --- a/it.po +++ b/it.po @@ -13,14 +13,15 @@ # Monica <momocat19(a)gmail.com>, 2014 # Random_R, 2013 # Random_R, 2013-2014 +# Rosario Antoci <pistacho(a)riseup.net>, 2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 13:00+0200\n" -"PO-Revision-Date: 2014-10-15 17:12+0000\n" -"Last-Translator: Lorenzo Farinelli <farinellilorenzo(a)gmail.com>\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-10-18 00:30+0000\n" +"Last-Translator: Rosario Antoci <pistacho(a)riseup.net>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -312,12 +313,12 @@ msgid "" msgstr "L'oscuramento dell'indirizzo MAC è fallito per la scheda di rete ${nic_name} (${nic}). Anche il recovery dell'errore è fallito, e pertanto la rete è disabilitata. Si potrebbe voler riavviare Tails e disabilitare il MAC spoofing. Per maggiori informazioni, consultare la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "error:" msgstr "errore:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Errore" @@ -367,63 +368,63 @@ msgstr "Avvia Tor Browser" msgid "Cancel" msgstr "Annulla" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Si desidera davvero avviare il browser non sicuro?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "L'attività di rete all'interno del browser non sicuro <b>non è anonima</b>. L'utilizzo del browser non sicuro dovrebbe avvenire solo quando strettamente necessario, ad esempio per fare un login o registrarsi per attivare la propria connessione Internet." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "_Avvia" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "_Esci" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "Avvio del browser non sicuro..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 msgid "This may take a while, so please be patient." msgstr "Questa operazione potrebbe richiedere del tempo." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "Configurazione chroot fallita." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Browser non sicuro" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:240 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." msgstr "Arresto del browser non sicuro..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:241 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Questa operazione potrebbe richiedere del tempo: non riavviare il browser non sicuro finchè non viene arrestato correttamente." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:253 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "Riavvio di Tor fallito." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:261 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Un altro browser non sicuro è già in esecuzione, o sta venendo ripulito. Riprovare più tardi." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:274 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." @@ -440,7 +441,7 @@ msgid "" "recommend that you learn how to <a " "href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open" " TrueCrypt volumes with cryptsetup</a> as soon as possible." -msgstr "" +msgstr "TrueCrypt non è più sviluppata e viene descritta dai propri autori come insicura. Quindi verrà rimpiazzata con Tails 1.2.1 (25 Novembre). Noi raccomandiamo che tu impari come <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>aprire i volumi TrueCrypt con cryptsetup</a> il prima possibile." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 msgid "I2P failed to start" @@ -450,7 +451,7 @@ msgstr "Avvio di I2P fallito" msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "" +msgstr "Qualcosa è andata male quandoI2P è stato avviato. Controlla i log in /var/log/i2p per maggiori informazioni." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 msgid "I2P's router console is ready" @@ -458,7 +459,7 @@ msgstr "La console del router I2P è pronta" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "" +msgstr "Adesso puoi accedere alla console router di I2P all'indirizzo http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 msgid "I2P is not ready" @@ -469,15 +470,15 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." -msgstr "" +msgstr "Il tunnel Eepsite non è stato costruito nell'arco di sei minuti. Controlla la console router all'indirizzo http://127.0.0.1:7657/logs o nei log in /var/log/i2p per maggiori informazioni. Riconnetti alla rete e riprova." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is ready" -msgstr "" +msgstr "I2P è pronto" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "You can now access services on I2P." -msgstr "" +msgstr "Adesso puoi accedere ai servizi su I2P" #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -494,11 +495,11 @@ msgstr "Impara a usare Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "Overlay network browser anonimo" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "" +msgstr "I2P Browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails"

1 0

[meek/master] Give priority to the bridge-params config style.
by dcf＠torproject.org 17 Oct '14

17 Oct '14

commit 5641086e79f9c9dbb89ce510d0def4871dabf0b7 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 17 09:18:16 2014 -0700 Give priority to the bridge-params config style. Most people who have meek these days will have tor 0.2.5, which can use the superior per-bridgeline configuration style. --- appengine/README | 8 ++++---- meek-client/meek-client.go | 4 ++-- meek-client/torrc | 17 +++++++++-------- meek-server/README | 2 +- php/README | 4 ++-- wsgi/README | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/appengine/README b/appengine/README index db91691..fe489f5 100644 --- a/appengine/README +++ b/appengine/README @@ -11,8 +11,8 @@ To test locally, run The app will be running at http://127.0.0.1:8080/. To configure meek-client to talk to the locally running app, put this in torrc: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8080/ --log meek-client.log + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log To deploy to App Engine, create a Google Account and use it to create a new app with a unique name. Edit the "application:" line of app.yaml to @@ -21,5 +21,5 @@ refer to your app's name. Run To configure meek-client to talk to the App Engine app, give the app's name as the url and "www.google.com" as the front domain. UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=https://yourapphere.appspot.com/ --front=www.google.com --log meek-client.log + Bridge meek 0.0.2.0:1 url=https://yourapphere.appspot.com/ front=www.google.com + ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 447e785..dd4a7f4 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -20,8 +20,8 @@ // is the same as this one using command line options: // Bridge meek 0.0.2.0:1 // ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com -// The advantage of SOCKS args is that multiple Bridge lines can have different -// configurations, but it requires a newer tor. +// The command-line configuration interface is for compatibility with tor 0.2.4 +// and older, which doesn't support parameters on Bridge lines. // // The --helper option prevents this program from doing any network operations // itself. Rather, it will send all requests through a browser extension that diff --git a/meek-client/torrc b/meek-client/torrc index 0e2efec..e7b297a 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -5,13 +5,14 @@ UseBridges 1 # Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080 -Bridge meek 0.0.2.0:1 -ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com +Bridge meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com +ClientTransportPlugin meek exec ./meek-client --log meek-client.log + +# With tor 0.2.4 or earlier, you have to configure the url and front on the +# command line, and you can only use one url/front combination at a time: +# Bridge meek 0.0.2.0:1 +# ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log # ClientTransportPlugin meek exec ./meek-client --url=https://d2zfqthxsdq309.cloudfront.net/ --front=a0.awsstatic.com --log meek-client.log # ClientTransportPlugin meek exec ./meek-client --url=https://az668014.vo.msecnd.net/ --front=ajax.aspnetcdn.com --log meek-client.log - -# With tor 0.2.5 you can do it this way: -# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com -# Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -# Bridge meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com -# ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/meek-server/README b/meek-server/README index d49d9ca..84ea4fb 100644 --- a/meek-server/README +++ b/meek-server/README @@ -11,7 +11,7 @@ - To test your bridge on the clinet side, you can add a line like this to your torrc: - Bridge meek 0.0.2.0:3 url=http://my-bridge.example.com:7002/ + Bridge meek 0.0.2.0:1 url=http://my-bridge.example.com:7002/ # Important Note: diff --git a/php/README b/php/README index 1df27d5..88063de 100644 --- a/php/README +++ b/php/README @@ -9,5 +9,5 @@ To test locally, run: The app will be running at http://127.0.0.1:8080/. To configure meek-client to talk to the locally running app, put this in torrc: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8080/ --log meek-client.log \ No newline at end of file + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/wsgi/README b/wsgi/README index a0e55b2..85a430e 100644 --- a/wsgi/README +++ b/wsgi/README @@ -6,5 +6,5 @@ To test locally, run: It will listen on port 8000. Configure tor as: UseBridges 1 - Bridge meek 0.0.2.0:1 - ClientTransportPlugin meek exec ./meek-client --url=http://127.0.0.1:8000/ + Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8000/ + ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit 4c9feb254d171857207f80eecbde346d599fb0f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 16:15:27 2014 +0000 Update translations for torcheck --- lo/torcheck.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lo/torcheck.po b/lo/torcheck.po index 57dd365..47f889f 100644 --- a/lo/torcheck.po +++ b/lo/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-17 15:45+0000\n" +"PO-Revision-Date: 2014-10-17 16:11+0000\n" "Last-Translator: Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>\n" "Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgid "" msgstr "ຖ້າທ່ານພະຍາຍາມຢາກໃຊ້ງານ ລູກຂ່າຍ ຕໍຣ໌, ກະລຸນາ ອ້າງອິງເຖິງ <a href=\"https://www.torproject.org/\"> ເວັບໄຊຕ໌ ຕໍຣ໌</a> ແລະ ໂດຍສະເພາະໃຫ້ເຂົ້າຫາ <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> ເພື່ອເອົາຂໍ້ແນະນໍາ ສຳລັບການຕັ້ງຄ່າ ລະບົບລູກຂ່າຍ ຕໍຣ໌ </a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "ຂໍອະໄພ, ການຄົ້ນຫາຂອງທ່ານລົ້ມເຫຼວ ຫຼື ໄດ້ຮັບການຕອບຮັບ ແບບບໍ່ຄາດຄິດ." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -53,16 +53,16 @@ msgid "" msgstr "" msgid "Your IP address appears to be: " -msgstr "" +msgstr "ທີ່ຢູ່ IP ທີ່ປາກົດ ແມ່ນ:" msgid "Are you using Tor?" -msgstr "" +msgstr "ທ່ານໄດ້ໃຊ້ ຕໍຣ໌ ບໍ່?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "ໜ້ານີ້ ມີ ເປັນພາສາ ດັ່ງນີ້ ຄືກັນ:" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "ສຳລັບຂໍ້ມູນຂ່າວສານເພີ່ມກ່ຽວກັບ ການຖ່າຍທອດນີ້, ໃຫ້ເຂົ້າເບິ່ງ:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "

1 0

[ooni-probe/master] ooniprobe v1.2.2
by art＠torproject.org 17 Oct '14

17 Oct '14

commit 8a20cc8ebdc4e2002f126c42a5b5c3a3b90bde13 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Oct 17 17:54:29 2014 +0200 ooniprobe v1.2.2 --- ChangeLog.rst | 2 +- debian/changelog | 4 ++-- ooni/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 041d329..cddf18f 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,7 +1,7 @@ Changelog ========= -v1.2.1 (Fri, 17 Oct 2014) +v1.2.2 (Fri, 17 Oct 2014) ------------------------- Who said friday 17th is only bad luck? diff --git a/debian/changelog b/debian/changelog index 21f3f9d..45128cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -ooniprobe (1.2.1-1) stable; urgency=low +ooniprobe (1.2.2-1) stable; urgency=low - * ooniprobe 1.2.1 + * ooniprobe 1.2.2 -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 17 Oct 2014 16:07:00 +0200 diff --git a/ooni/__init__.py b/ooni/__init__.py index 9c676f5..305222c 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.2.1" +__version__ = "1.2.2" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Fix type in README and manpage for oonideckgen.
by art＠torproject.org 17 Oct '14

17 Oct '14

commit a38f5fc6f5f5d3e49fb190bd561f15b2e6012377 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Oct 5 13:56:35 2014 +0200 Fix type in README and manpage for oonideckgen. ooniresource is actually ooniresources. --- README.rst | 8 ++++---- data/oonideckgen.1 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 7a0e749..1299276 100644 --- a/README.rst +++ b/README.rst @@ -67,7 +67,7 @@ To install it from the current master run:: The run:: mkdir my_decks - sudo ooniresource --update-inputs --update-geoip + sudo ooniresources --update-inputs --update-geoip oonideckgen -o my_decks/ The output from the last command will tell you how to run ooniprobe to perform @@ -180,7 +180,7 @@ To generate decks you will have to update the input resources of ooniprobe. This can be done with:: - ooniresource --update-inputs + ooniresources --update-inputs If you get a permission error, you may have to run the command as root or change the ooniprobe data directory inside of `ooniprobe.conf`. @@ -189,7 +189,7 @@ On some platforms, for example debian contrib, you will not get all the geoip related files needed. In that case it is possible to manually download them with ``ooniresources``:: - ooniresource --update-geoip + ooniresources --update-geoip Generating decks ---------------- @@ -199,7 +199,7 @@ You can generate decks for your country thanks to the oonideckgen command. If you wish, for example, to generate a deck to be run in the country of Italy, you can do so (be sure to have updated the input resources first) by running:: - oonideck --country-code IT --output ~/ + oonideckgen --country-code IT --output ~/ You will now have in your home a folder called `deck-it`, containing the ooni deck (ends with .deck) and the inputs. diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 index 9406d98..f808165 100644 --- a/data/oonideckgen.1 +++ b/data/oonideckgen.1 @@ -75,7 +75,7 @@ This tools will generate a test deck that include the following tests: If deckgen is run with no arugment a geoip lookup is done on the IP of the user and that country is chosen. -In order to run deckgen you must have first have run ooniresource --update-inputs. +In order to run deckgen you must have first have run ooniresources --update-inputs. .sp .SH AUTHOR

1 0

[ooni-probe/master] Add ooni.deckgen.processors to the packages listed in setup.py
by art＠torproject.org 17 Oct '14

17 Oct '14

commit 21ddd7ba6efac8ec7f92a897bd6d9946b776947d Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Oct 9 09:36:09 2014 +0200 Add ooni.deckgen.processors to the packages listed in setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 006c289..aa17f85 100644 --- a/setup.py +++ b/setup.py @@ -74,6 +74,7 @@ packages=[ 'ooni', 'ooni.api', 'ooni.deckgen', + 'ooni.deckgen.processors', 'ooni.kit', 'ooni.nettests', 'ooni.nettests.manipulation',

1 0

[ooni-probe/master] update ooniprobe to 1.2.1
by art＠torproject.org 17 Oct '14

17 Oct '14

commit 44813f114eed11c84a1ba3bc757e351b13bbfa08 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Oct 17 17:48:06 2014 +0200 update ooniprobe to 1.2.1 --- ChangeLog.rst | 9 +++++++++ debian/changelog | 6 ++++++ ooni/__init__.py | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 58b6e8e..041d329 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,15 @@ Changelog ========= +v1.2.1 (Fri, 17 Oct 2014) +------------------------- + +Who said friday 17th is only bad luck? + +* Add two new report entry keys test_start_time and test_runtime + +* Fix bug that lead to ooniresources not working properly + v1.2.0 (Wed, 1 Oct 2014) ------------------------- diff --git a/debian/changelog b/debian/changelog index 5340a13..21f3f9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.2.1-1) stable; urgency=low + + * ooniprobe 1.2.1 + + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 17 Oct 2014 16:07:00 +0200 + ooniprobe (1.2.0-1) stable; urgency=low * ooniprobe 1.2.0 diff --git a/ooni/__init__.py b/ooni/__init__.py index c873f37..9c676f5 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.2.0" +__version__ = "1.2.1" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Add support for test_start_time and test_runtime keys in report.
by art＠torproject.org 17 Oct '14

17 Oct '14

commit 2bb6595baa74e90bc4a2927be1a266d3632fda90 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Oct 17 11:05:16 2014 +0200 Add support for test_start_time and test_runtime keys in report. --- ooni/nettest.py | 9 ++++++++- ooni/otime.py | 7 ++++++- ooni/reporter.py | 19 ------------------- ooni/tasks.py | 12 ++++++++++-- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 3db82d7..4a07b7d 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -8,6 +8,7 @@ from twisted.internet import defer from twisted.trial.runner import filenameToModule from twisted.python import usage, reflect +from ooni import otime from ooni.tasks import Measurement from ooni.utils import log, checkForRoot, sanitize_options from ooni.settings import config @@ -201,7 +202,7 @@ class NetTestLoader(object): input_file_hashes.append(input_file['hash']) options = sanitize_options(self.options) - test_details = {'start_time': time.time(), + test_details = {'start_time': otime.epochToUTC(time.time()), 'probe_asn': config.probe_ip.geodata['asn'], 'probe_cc': config.probe_ip.geodata['countrycode'], 'probe_ip': config.probe_ip.geodata['ip'], @@ -527,6 +528,12 @@ class NetTest(object): if self.report: post = defer.DeferredList(measurements) + @post.addCallback + def set_runtime(results): + runtime = time.time() - test_instance._start_time + test_instance.report['test_runtime'] = runtime + return results + # Call the postProcessor, which must return a single report # or a deferred post.addCallback(test_instance.postProcessor) diff --git a/ooni/otime.py b/ooni/otime.py index 51124db..60725c3 100644 --- a/ooni/otime.py +++ b/ooni/otime.py @@ -65,5 +65,10 @@ def timestamp(t=None): ISO8601 = "%Y-%m-%dT%H%M%SZ" return t.strftime(ISO8601) + def epochToTimestamp(seconds): - return timestamp(datetime.utcfromtimestamp(seconds)) + return timestamp(datetime.fromtimestamp(seconds)) + + +def epochToUTC(seconds): + return float(datetime.utcfromtimestamp(seconds).strftime("%s")) diff --git a/ooni/reporter.py b/ooni/reporter.py index e0e92c6..06f866e 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -142,25 +142,6 @@ class OReporter(object): def finish(self): pass - def testDone(self, test, test_name): - # XXX put this inside of Report.close - # or perhaps put something like this inside of netTestDone - log.msg("Finished running %s" % test_name) - test_report = dict(test.report) - - if isinstance(test.input, Packet): - test_input = createPacketReport(test.input) - else: - test_input = test.input - - test_report['input'] = test_input - test_report['test_name'] = test_name - test_report['test_started'] = test._start_time - test_report['test_runtime'] = time.time() - test._start_time - - return defer.maybeDeferred(self.writeReportEntry, test_report) - - class YAMLReporter(OReporter): """ diff --git a/ooni/tasks.py b/ooni/tasks.py index 9d281ab..3f331a2 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -1,8 +1,10 @@ import time +from twisted.internet import defer, reactor + from ooni import errors as e from ooni.settings import config -from twisted.internet import defer, reactor +from ooni import otime class BaseTask(object): @@ -109,9 +111,15 @@ class Measurement(TaskWithTimeout): self.testInstance = test_instance self.testInstance.input = test_input self.testInstance._setUp() + if not hasattr(self.testInstance, '_start_time'): + self.testInstance._start_time = time.time() + if 'input' not in self.testInstance.report.keys(): self.testInstance.report['input'] = test_input - self.testInstance._start_time = time.time() + if 'test_start_time' not in self.testInstance.report.keys(): + start_time = otime.epochToUTC(self.testInstance._start_time) + self.testInstance.report['test_start_time'] = start_time + self.testInstance.setUp() self.netTestMethod = getattr(self.testInstance, test_method)

1 0

[ooni-probe/master] Fix link to README.rst
by art＠torproject.org 17 Oct '14

17 Oct '14

commit 9bf27b839d44627ab44ef0a20e79a80bed5fb88e Author: kraai <kraai(a)ftbfs.org> Date: Tue Oct 14 14:05:40 2014 +0000 Fix link to README.rst --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 3ad464f..5dfa05d 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -9,7 +9,7 @@ censorship related research. If you are a user interesting in running the ooniprobe command line tool see: - https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/README.md + https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/README.rst The two main software components of ooniprobe are ooniprobe and oonib.

1 0

[ooni-probe/master] Change the payload of the filename prefix files.
by art＠torproject.org 17 Oct '14

17 Oct '14

commit c9be29c17dfa36cbccd10097702b1a21b451fec7 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Oct 17 15:52:29 2014 +0200 Change the payload of the filename prefix files. Setting a time too close to epoch makes UTC time conversions not work. --- ooni/tests/test_utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index 5056b75..829ba90 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -8,7 +8,7 @@ class TestUtils(unittest.TestCase): def setUp(self): self.test_details = { 'test_name': 'foo', - 'start_time': 1 + 'start_time': 441759600 } self.extension = 'ext' self.prefix = 'prefix' @@ -46,19 +46,19 @@ class TestUtils(unittest.TestCase): def test_generate_filename(self): filename = generate_filename(self.test_details) - self.assertEqual(filename, 'foo-1970-01-01T000001Z') + self.assertEqual(filename, 'foo-1984-01-01T000000Z') def test_generate_filename_with_extension(self): filename = generate_filename(self.test_details, extension=self.extension) - self.assertEqual(filename, 'foo-1970-01-01T000001Z.ext') + self.assertEqual(filename, 'foo-1984-01-01T000000Z.ext') def test_generate_filename_with_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix) - self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z') + self.assertEqual(filename, 'prefix-foo-1984-01-01T000000Z') def test_generate_filename_with_extension_and_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix, extension=self.extension) - self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z.ext') + self.assertEqual(filename, 'prefix-foo-1984-01-01T000000Z.ext') def test_generate_filename_with_filename(self): filename = generate_filename(self.test_details, filename=self.filename)

1 0