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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 6ec04cdd96ac3790aba0d31ad36b09895fd02305 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 17:15:20 2014 +0000 Update translations for liveusb-creator --- sk/sk.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 89d2afd..6cad3a7 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-24 16:45+0000\n" +"PO-Revision-Date: 2014-03-24 17:00+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format msgid "%(distribution)s Installer" -msgstr "" +msgstr "%(distribution)s inštalátor" #: ../liveusb/gui.py:808 #, python-format @@ -35,7 +35,7 @@ msgstr "%(filename)s vybraný" #: ../liveusb/gui.py:439 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:445 #, python-format @@ -63,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú zmazané. </span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú stratené. </span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -205,7 +205,7 @@ msgstr "Ak si nezvolíte už existujúce Live ISO, bude vám stiahnuté vybraté #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "Nainštalovať Tails" #: ../liveusb/gui.py:630 msgid "Installation complete!" @@ -336,7 +336,7 @@ msgstr "Cieľové zariadenie" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "Master Boot Record na vašom zariadení je prázdny. Stlačením 'Nainštalovať Tails' znovu sa obnoví MBR na tomto zariadení." #: ../liveusb/gui.py:796 msgid "" @@ -407,7 +407,7 @@ msgstr "Nepodarilo sa nájsť žiadne USB zariadenie" #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" -msgstr "" +msgstr "Nenašlo sa žiadne podporované zariadenie" #: ../liveusb/creator.py:1040 msgid "Unable to find partition" @@ -484,7 +484,7 @@ msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'" #: ../liveusb/creator.py:876 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Nepodporované zariadenie '%(device)s', prosíme nahláste túto chybu." #: ../liveusb/creator.py:770 ../liveusb/creator.py:893 #, python-format @@ -539,7 +539,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Varovanie: Master Boot Record na vašom zariadení sa nezhoduje so syslinux MBR vášho systému. Ak máte problém s bootovaním tohto kľúča, vyskúšajte spustiť liveusb-creator s voľbou --reset-mbr." #: ../liveusb/gui.py:392 msgid "" @@ -558,7 +558,7 @@ msgstr "Zapísané na zariadenie rýchlosťou %(speed)d Mb/s" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Idete inštalovať Tails na %(size)s %(vendor)s %(model)s zariadení (%(device)s). Všetky dáta na vybranom zariadení budú stratené. Pokračovať?" #: ../liveusb/gui.py:719 #, python-format @@ -566,7 +566,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Idete aktualizovať Tails na %(parent_size)s %(vendor)s %(model)s zariadení (%(device)s). Všetka trvalá kapacita na tomto zariadení bude zachovaná. Pokračovať?" #: ../liveusb/creator.py:604 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 49a6ed695f5eadda4ebd3777608024805b3056be Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 16:45:20 2014 +0000 Update translations for liveusb-creator --- sk/sk.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 8f4bc14..89d2afd 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-22 09:10+0000\n" +"PO-Revision-Date: 2014-03-24 16:45+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "" #: ../liveusb/gui.py:445 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -54,7 +54,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Potrebujete pomoc? Prečítajte si </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentáciu</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -63,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú zmazané. </span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -72,7 +72,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Skopírujte spustený Tails na zariadenie, kde už je nainštalovaný. Ostatné partície nájdené na kľúči sú zachované.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -81,7 +81,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Aktualizujte si zariadenie s už nainštalovaným Tails z nového ISO obrazu.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -97,7 +97,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Alokovaním dodatočného miesta na vašom USB kľúči pre trvalé prekrytie budete schopní ukladať dáta a robiť pernamentné úpravy vášho live operačného systému. Bez toho nebude možné uložiť dáta, ktoré by sa zachovali aj po reboote." +msgstr "Alokovaním dodatočného miesta na vašom USB kľúči pre trvalé úložisko budete schopní ukladať dáta a robiť pernamentné úpravy vášho live operačného systému. Bez toho nebude možné uložiť dáta, ktoré by sa zachovali aj po reboote." #: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 #, python-format @@ -135,7 +135,7 @@ msgstr "Vytváram %sMB trvalé úložisko" #: ../liveusb/gui.py:567 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "Zariadenie zatiaľ nie je pripojené, takže nemôžeme určiť množstvo voľného miesta." #: ../liveusb/dialog.py:166 #, python-format @@ -162,7 +162,7 @@ msgstr "Zariadenie je slučka, preskakujem resetovanie hlavného bootovacieho z #: ../liveusb/creator.py:813 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Vkladá sa unmount_device pre zariadenie %(device)s'" #: ../liveusb/creator.py:1198 msgid "Error probing device" @@ -182,7 +182,7 @@ msgstr "Chyba: SHA1 kontrolný súčet Live CD je neplatný. Na preskočenie tej #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Extrahuje sa live obraz na cieľové zariadenie..." #: ../liveusb/creator.py:1063 #, python-format @@ -263,12 +263,12 @@ msgstr "Partícia je FAT16; obmedzuje veľkosť na 2 GB" #: ../liveusb/gui.py:550 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Partícia je FAT32; Veľkosť úložiska sa obmedzuje na 4G" #: ../liveusb/creator.py:226 ../liveusb/creator.py:842 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Rozdeľuje sa zariadenie %(device)s" #: ../liveusb/gui.py:621 msgid "Persistent Storage" @@ -280,7 +280,7 @@ msgstr "Trvalé úložisko (0 MB)" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" -msgstr "" +msgstr "Prosíme potvrďte váš výber zariadenia" #: ../liveusb/gui.py:467 msgid "Refreshing releases..." @@ -317,7 +317,7 @@ msgstr "Nastavuje sa zavádzací súbor OLPC..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Sú pripojené niektoré partície cieľového zariadenia %(device)s. Pred začatím inštalácie budú odpojené." #: ../liveusb/creator.py:131 msgid "" @@ -364,27 +364,27 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Toto tlačidlo odštartuje proces vytvárania LiveUSB. Zahŕňa to prípadné stiahnutie vydania (ak nebolo zvolené žiadne existujúce), extrahovanie ISO súboru na USB zariadenie, vytvorenie trvalého úložiska a inštaláciu zavádzača." #: ../liveusb/dialog.py:167 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Toto je USB kľúč, na ktorom chcete nainštalovať váš Live systém. Zariadenie musí byť naformátované so súborovým systémom FAT." #: ../liveusb/dialog.py:172 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Táto lišta bude indikovať, ako ďaleko sa momentálne nachádzate v procese vytvárania LiveUSB" #: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "Toto je stavová konzola, do ktorej budú vypisované všetky správy." #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "Snažiť sa napriek tomu pokračovať." #: ../liveusb/creator.py:911 #, python-format @@ -474,12 +474,12 @@ msgstr "Neznáme vydanie: %s" #: ../liveusb/creator.py:827 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Odpája sa '%(udi)s' na zariadení '%(device)s'" #: ../liveusb/creator.py:823 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'" #: ../liveusb/creator.py:876 #, python-format @@ -496,7 +496,7 @@ msgstr "Nepodporovaný súborový systém: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "Nepodporovaný súborový systém: %s\nV prípade, že sa pokúšate aktualizovať manuálne nainštalovaný systém Tails (čiže bez pomoci tohto inštalátora), táto voľba nie je podporovaná: potrebujete si nainštalovať namiesto toho nový, napr. zvolením akcie \"Naklonovať & nainštalovať\"." #: ../liveusb/creator.py:1213 #, python-format @@ -507,11 +507,11 @@ msgstr "Nepodporovaný súborový systém: %s\nSpravte zálohu a naformátujte U #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" -msgstr "" +msgstr "Aktualizovať z ISO" #: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Použiť už existujúce Live systém ISO" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -532,7 +532,7 @@ msgstr "Kontroluje sa súborový systém..." #: ../liveusb/gui.py:729 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Upozornenie: Vytvorením nového trvalého úložiska sa vymaže už existujúce." +msgstr "Upozornenie: Vytvorením nového trvalého úložiska sa vymaže to už existujúce." #: ../liveusb/gui.py:681 msgid ""

1 0

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

24 Mar '14

commit 2e023c8e6f3f9cedf7e599b14c7b64604a061a68 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 16:15:48 2014 +0000 Update translations for tails-iuk --- el.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/el.po b/el.po index 45b6b70..936e561 100644 --- a/el.po +++ b/el.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Teogramm <theodorewii121(a)hotmail.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-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-24 16:10+0000\n" +"Last-Translator: Teogramm <theodorewii121(a)hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" -msgstr "" +msgstr "Το σύστημα είναι αναβαθμισμένο." #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." @@ -90,7 +91,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:360 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Πρόβλημα κατά τον έλεγχο των διαθέσιμων αναβαθμίσεων" #: ../lib/Tails/IUK/Frontend.pm:370 #, perl-brace-format @@ -110,7 +111,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "" +msgstr "Διαθέσιμη αναβάθμιση." #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" @@ -184,19 +185,19 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:579 msgid "Restart Tails" -msgstr "" +msgstr "Επανεκκίνηση του Talis" #: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart now" -msgstr "" +msgstr "Επανεκκίνηση τώρα" #: ../lib/Tails/IUK/Frontend.pm:581 msgid "Restart later" -msgstr "" +msgstr "Επανεκκίνηση αργότερα" #: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while restarting the system" -msgstr "" +msgstr "Πρόβλημα κατά την επανεκκίνηση" #: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to restart the system"

1 0

[ooni-probe/master] Merge branch 'master' into feature/bridget
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 283ed262507377a0a14c7c8445831485a43cab06 Merge: 01058a9 aa45aca Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 12:59:44 2014 +0100 Merge branch 'master' into feature/bridget * master: (510 commits) Install pyrex-real so that new pip does not give error Update index of documentation page. Bump to v1.0.0-rc-7 Add WARNING message to every run of ooniprobe. Expand the disclaimer in the README.md Update vagrant link to point to https site. Bump to version 1.0.0 Add instructions on setting up development dependencies. Make the geoip related tests make a less stronger assertion. Make GeoIP AS and GeoIP City soft dependencies. Minor fixes to comments DNS-host-resolution-for-tls_handshake Bug-Fixes-for-tls_handshake Properly expand the home directory to that of the user running ooniprobe. Fix import error in test_managers. Properly handle the cancelled failure. Silence the dummy protocol Write test that reproduces HTTP test stalling condition. Call connectionLost to avoid dirty reactor. Pass the mock super socket in the ScapyFactory constructor ... .coveragerc | 4 + .gitignore | 5 +- .travis.yml | 16 +- ChangeLog.md | 30 + HACKING | 2 +- LICENSE | 5 +- MANIFEST.in | 7 + Makefile | 202 - README.md | 272 +- Vagrantfile | 44 + bin/oonib | 36 - bin/oonid | 7 + collector | 1 - data/Makefile | 12 +- data/decks/complete.deck | 72 + data/decks/complete_no_root.deck | 60 + data/decks/fast.deck | 36 + data/decks/fast_no_root.deck | 24 + data/decks/mlab.deck | 60 + data/decks/mlab_no_root.deck | 48 + data/inputs/Makefile | 13 + data/inputs/README | 47 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + data/ooniprobe.conf.sample | 64 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/component.json | 23 + data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + debian/README | 5 + debian/changelog | 5 + debian/compat | 1 + debian/control | 54 + debian/copyright | 51 + debian/rules | 6 + debian/source/format | 1 + decks/before_i_commit.testdeck | 36 - decks/short_no_root.deck | 60 - docs/fabfile.py | 22 + docs/source/architecture.rst | 40 + docs/source/index.rst | 18 +- docs/source/reports.rst | 15 +- docs/source/tests/dnsconsistency.rst | 4 +- docs/source/tests/dnsspoof.rst | 2 +- docs/source/tests/http_requests.rst | 6 +- fabfile.py | 47 +- inputs/Makefile | 11 - inputs/README | 47 - nettests/NETTESTS_HAVE_MOVED.txt | 1 + nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 45 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 109 - nettests/manipulation/http_invalid_request_line.py | 109 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/__init__.py | 12 +- ooni/api/spec.py | 253 + ooni/config.py | 118 - ooni/deck.py | 214 + ooni/director.py | 182 +- ooni/errors.py | 99 +- ooni/geoip.py | 194 + ooni/managers.py | 82 +- ooni/nettest.py | 455 +- ooni/nettests/blocking/__init__.py | 1 + ooni/nettests/blocking/dnsconsistency.py | 180 + ooni/nettests/blocking/http_requests.py | 124 + ooni/nettests/blocking/tcp_connect.py | 70 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + ooni/nettests/experimental/chinatrigger.py | 108 + ooni/nettests/experimental/dns_injection.py | 63 + ooni/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + ooni/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + ooni/nettests/experimental/keyword_filtering.py | 52 + ooni/nettests/experimental/parasitictraceroute.py | 129 + ooni/nettests/experimental/script.py | 90 + ooni/nettests/experimental/squid.py | 117 + ooni/nettests/experimental/tls_handshake.py | 837 ++ ooni/nettests/manipulation/captiveportal.py | 650 + ooni/nettests/manipulation/daphne.py | 120 + ooni/nettests/manipulation/dnsspoof.py | 76 + .../manipulation/http_header_field_manipulation.py | 160 + ooni/nettests/manipulation/http_host.py | 160 + .../manipulation/http_invalid_request_line.py | 110 + ooni/nettests/manipulation/traceroute.py | 135 + ooni/nettests/scanning/http_url_list.py | 98 + ooni/nettests/third_party/Makefile | 3 + ooni/nettests/third_party/README | 14 + ooni/nettests/third_party/netalyzr.py | 58 + ooni/oonibclient.py | 252 + ooni/oonicli.py | 223 +- ooni/oonid.py | 20 + ooni/otime.py | 2 + ooni/reporter.py | 281 +- ooni/runner.py | 241 - ooni/settings.py | 99 + ooni/tasks.py | 61 +- ooni/templates/dnst.py | 10 +- ooni/templates/httpt.py | 55 +- ooni/templates/scapyt.py | 8 +- ooni/templates/tcpt.py | 2 + ooni/tests/__init__.py | 3 + ooni/tests/disable_test_dns.py | 24 + ooni/tests/mocks.py | 172 + ooni/tests/test_deck.py | 130 + ooni/tests/test_director.py | 47 + ooni/tests/test_geoip.py | 22 + ooni/tests/test_managers.py | 228 + ooni/tests/test_mutate.py | 15 + ooni/tests/test_nettest.py | 315 + ooni/tests/test_oonibclient.py | 150 + ooni/tests/test_otime.py | 15 + ooni/tests/test_reporter.py | 91 + ooni/tests/test_safe_represent.py | 14 + ooni/tests/test_templates.py | 43 + ooni/tests/test_trueheaders.py | 41 + ooni/tests/test_txscapy.py | 47 + ooni/tests/test_utils.py | 22 + ooni/utils/__init__.py | 16 +- ooni/utils/geodata.py | 40 - ooni/utils/log.py | 27 +- ooni/utils/logo.py | 214 - ooni/utils/net.py | 36 +- ooni/utils/onion.py | 704 - ooni/utils/trueheaders.py | 159 + ooni/utils/txagentwithsocks.py | 215 - ooni/utils/txscapy.py | 21 +- oonib/INSTALL | 4 - oonib/README.md | 117 - oonib/__init__.py | 24 - oonib/config.py | 58 - oonib/db/__init__.py | 30 - oonib/db/tables.py | 123 - oonib/models.py | 129 - oonib/oonibackend.py | 74 - oonib/report/__init__.py | 5 - oonib/report/api.py | 106 - oonib/report/file_collector.py | 193 - oonib/requirements.txt | 24 - oonib/runner.py | 81 - oonib/testhelpers/__init__.py | 5 - oonib/testhelpers/dns_helpers.py | 16 - oonib/testhelpers/http_helpers.py | 154 - oonib/testhelpers/ssl_helpers.py | 9 - oonib/testhelpers/tcp_helpers.py | 72 - ooniprobe.conf.sample | 42 - requirements-dev.txt | 1 + requirements.txt | 41 +- scripts/archive_reports.py | 174 - scripts/build-ooniprobe.sh | 15 + setup-dependencies.sh | 1002 +- setup.py | 118 +- tests/mocks.py | 168 - tests/test-class-design.py | 101 - tests/test_director.py | 58 - tests/test_dns.py | 24 - tests/test_inputunit.py | 29 - tests/test_managers.py | 215 - tests/test_mutate.py | 15 - tests/test_nettest.py | 264 - tests/test_otime.py | 15 - tests/test_reporter.py | 238 - tests/test_runner.py | 80 - tests/test_safe_represent.py | 14 - tests/test_trueheaders.py | 41 - tests/test_utils.py | 20 - 229 files changed, 44851 insertions(+), 8729 deletions(-) diff --cc ooni/reporter.py index 3da1eea,c8d0748..cf35a87 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@@ -24,20 -26,17 +26,18 @@@ try from scapy.packet import Packet except ImportError: log.err("Scapy is not installed.") - + class Packet(object): + pass - from ooni.errors import InvalidOONIBCollectorAddress - from ooni.errors import ReportNotCreated, ReportAlreadyClosed + from ooni import errors from ooni import otime - from ooni.utils import geodata, pushFilenameStack + from ooni.utils import pushFilenameStack from ooni.utils.net import BodyReceiver, StringProducer, userAgents - from ooni import config - - from ooni.tasks import ReportEntry, TaskTimedOut + from ooni.settings import config + from ooni.tasks import ReportEntry, ReportTracker class ReporterException(Exception): pass

1 0

[ooni-probe/master] Rename bridget to bridge_reachability
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 0237bcfb340498a45081f935642ac0e28db74e55 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:04:36 2014 +0100 Rename bridget to bridge_reachability --- nettests/experimental/bridget.py | 89 ------------------------- ooni/nettests/blocking/bridge_reachability.py | 89 +++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py deleted file mode 100644 index acce3d3..0000000 --- a/nettests/experimental/bridget.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- encoding: utf-8 -*- -import random -import string -import subprocess -from distutils.spawn import find_executable - -from twisted.python import usage -from twisted.internet import defer, reactor - -import txtorcon - -from ooni.utils import log -from ooni import nettest - -class UsageOptions(usage.Options): - optParameters = [['timeout', 't', 60, - 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], - ] - -class BridgeReachability(nettest.NetTestCase): - name = "BridgeReachability" - author = "Arturo Filastò" - version = "0.1" - - usageOptions = UsageOptions - - inputFile = ['file', 'f', None, - 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] - - def setUp(self): - self.tor_progress = 0 - self.timeout = int(self.localOptions['timeout']) - self.report['timeout'] = self.timeout - self.bridge = self.input - self.pyobfsproxy_bin = find_executable('obfsproxy') - - def test_full_tor_connection(self): - def getTransport(address): - """ - If the address of the bridge starts with a valid c identifier then - we consider it to be a bridge. - Returns: - The transport_name if it's a transport. - None if it's not a obfsproxy bridge. - """ - transport_name = address.split(' ')[0] - transport_name_chars = string.ascii_letters + string.digits - if all(c in transport_name_chars for c in transport_name): - return transport_name - else: - return None - - config = txtorcon.TorConfig() - config.ControlPort = random.randint(2**14, 2**16) - config.SocksPort = random.randint(2**14, 2**16) - - transport_name = getTransport(self.bridge) - if transport_name and self.pyobfsproxy_bin: - config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) - self.report['transport_name'] = transport_name - elif transport_name and not self.pyobfsproxy_bin: - log.err("Unable to test bridge because pyobfsproxy is not installed") - self.report['success'] = None - return - - config.Bridge = self.bridge - config.UseBridges = 1 - config.save() - - def updates(prog, tag, summary): - print "Tor progress: %s%%" % prog - self.report['tor_progress'] = int(prog) - self.report['tor_progress_tag'] = tag - self.report['tor_progress_summary'] = summary - - d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, - progress_updates=updates) - @d.addCallback - def setup_complete(proto): - print "Success" - self.report['success'] = True - - @d.addErrback - def setup_failed(failure): - print "Failed" - log.exception(failure) - self.report['success'] = False - - return d diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py new file mode 100644 index 0000000..acce3d3 --- /dev/null +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -0,0 +1,89 @@ +# -*- encoding: utf-8 -*- +import random +import string +import subprocess +from distutils.spawn import find_executable + +from twisted.python import usage +from twisted.internet import defer, reactor + +import txtorcon + +from ooni.utils import log +from ooni import nettest + +class UsageOptions(usage.Options): + optParameters = [['timeout', 't', 60, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], + ] + +class BridgeReachability(nettest.NetTestCase): + name = "BridgeReachability" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, + 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + + def setUp(self): + self.tor_progress = 0 + self.timeout = int(self.localOptions['timeout']) + self.report['timeout'] = self.timeout + self.bridge = self.input + self.pyobfsproxy_bin = find_executable('obfsproxy') + + def test_full_tor_connection(self): + def getTransport(address): + """ + If the address of the bridge starts with a valid c identifier then + we consider it to be a bridge. + Returns: + The transport_name if it's a transport. + None if it's not a obfsproxy bridge. + """ + transport_name = address.split(' ')[0] + transport_name_chars = string.ascii_letters + string.digits + if all(c in transport_name_chars for c in transport_name): + return transport_name + else: + return None + + config = txtorcon.TorConfig() + config.ControlPort = random.randint(2**14, 2**16) + config.SocksPort = random.randint(2**14, 2**16) + + transport_name = getTransport(self.bridge) + if transport_name and self.pyobfsproxy_bin: + config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) + self.report['transport_name'] = transport_name + elif transport_name and not self.pyobfsproxy_bin: + log.err("Unable to test bridge because pyobfsproxy is not installed") + self.report['success'] = None + return + + config.Bridge = self.bridge + config.UseBridges = 1 + config.save() + + def updates(prog, tag, summary): + print "Tor progress: %s%%" % prog + self.report['tor_progress'] = int(prog) + self.report['tor_progress_tag'] = tag + self.report['tor_progress_summary'] = summary + + d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, + progress_updates=updates) + @d.addCallback + def setup_complete(proto): + print "Success" + self.report['success'] = True + + @d.addErrback + def setup_failed(failure): + print "Failed" + log.exception(failure) + self.report['success'] = False + + return d

1 0

[ooni-probe/master] Use find_executable instead of homebrew function and search for obfsproxy
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 1d4efdc0b8560f5001cb90553fec34804c89e90d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:03:18 2014 +0100 Use find_executable instead of homebrew function and search for obfsproxy --- nettests/experimental/bridget.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py index 1cb7b32..acce3d3 100644 --- a/nettests/experimental/bridget.py +++ b/nettests/experimental/bridget.py @@ -2,6 +2,7 @@ import random import string import subprocess +from distutils.spawn import find_executable from twisted.python import usage from twisted.internet import defer, reactor @@ -16,8 +17,8 @@ class UsageOptions(usage.Options): 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], ] -class KeywordFiltering(nettest.NetTestCase): - name = "BridgetKISS" +class BridgeReachability(nettest.NetTestCase): + name = "BridgeReachability" author = "Arturo Filastò" version = "0.1" @@ -27,23 +28,11 @@ class KeywordFiltering(nettest.NetTestCase): 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] def setUp(self): - - def find_pyobfsproxy(): - try: - proc = subprocess.Popen(('type -p pyobfsproxy', ), stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=True) - except OSError: - pass - else: - stdout, _ = proc.communicate() - if proc.poll() == 0 and stdout != '': - return stdout.strip() - self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) self.report['timeout'] = self.timeout self.bridge = self.input - self.pyobfsproxy_bin = find_pyobfsproxy() + self.pyobfsproxy_bin = find_executable('obfsproxy') def test_full_tor_connection(self): def getTransport(address): @@ -85,7 +74,7 @@ class KeywordFiltering(nettest.NetTestCase): self.report['tor_progress_summary'] = summary d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, - progress_updates=updates) + progress_updates=updates) @d.addCallback def setup_complete(proto): print "Success"

1 0

[ooni-probe/master] Add support for pyobfsproxy based bridge testing
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 01058a96860b3d01e22438cf5e6568cdf606f3d0 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 16 13:06:42 2013 -0400 Add support for pyobfsproxy based bridge testing --- nettests/experimental/bridget.py | 77 +++++++++++++++++++++++++++++--------- ooni/reporter.py | 3 +- 2 files changed, 61 insertions(+), 19 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py index 8f31e80..1cb7b32 100644 --- a/nettests/experimental/bridget.py +++ b/nettests/experimental/bridget.py @@ -1,21 +1,23 @@ +# -*- encoding: utf-8 -*- import random +import string +import subprocess from twisted.python import usage -from twisted.internet import defer +from twisted.internet import defer, reactor import txtorcon -from txtorcon.torconfig import TorSetupTimeout from ooni.utils import log from ooni import nettest class UsageOptions(usage.Options): - optParameters = [['timeout', 't', 30, - 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'] + optParameters = [['timeout', 't', 60, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], ] class KeywordFiltering(nettest.NetTestCase): - name = "Bridget, at it's bare minimum" + name = "BridgetKISS" author = "Arturo Filastò" version = "0.1" @@ -25,35 +27,74 @@ class KeywordFiltering(nettest.NetTestCase): 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] def setUp(self): + + def find_pyobfsproxy(): + try: + proc = subprocess.Popen(('type -p pyobfsproxy', ), stdout=subprocess.PIPE, + stderr=subprocess.PIPE, shell=True) + except OSError: + pass + else: + stdout, _ = proc.communicate() + if proc.poll() == 0 and stdout != '': + return stdout.strip() + self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) self.report['timeout'] = self.timeout + self.bridge = self.input + self.pyobfsproxy_bin = find_pyobfsproxy() def test_full_tor_connection(self): + def getTransport(address): + """ + If the address of the bridge starts with a valid c identifier then + we consider it to be a bridge. + Returns: + The transport_name if it's a transport. + None if it's not a obfsproxy bridge. + """ + transport_name = address.split(' ')[0] + transport_name_chars = string.ascii_letters + string.digits + if all(c in transport_name_chars for c in transport_name): + return transport_name + else: + return None + config = txtorcon.TorConfig() - config.OrPort = random.randint(2**14, 2**16) + config.ControlPort = random.randint(2**14, 2**16) config.SocksPort = random.randint(2**14, 2**16) - config.Bridge = self.input + + transport_name = getTransport(self.bridge) + if transport_name and self.pyobfsproxy_bin: + config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) + self.report['transport_name'] = transport_name + elif transport_name and not self.pyobfsproxy_bin: + log.err("Unable to test bridge because pyobfsproxy is not installed") + self.report['success'] = None + return + + config.Bridge = self.bridge config.UseBridges = 1 + config.save() def updates(prog, tag, summary): + print "Tor progress: %s%%" % prog self.report['tor_progress'] = int(prog) + self.report['tor_progress_tag'] = tag + self.report['tor_progress_summary'] = summary - d = txtorcon.launch_tor(config, reactor, progress_updates=updates, self.timeout) + d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, + progress_updates=updates) @d.addCallback def setup_complete(proto): - self.report['failed'] = False + print "Success" + self.report['success'] = True @d.addErrback def setup_failed(failure): - failure.trap(TorSetupTimeout) - if isinstance(failure, TorSetupTimeout): - self.report['failure'] = 'timedout' - else: - self.report['failure'] = 'unknown' - self.report['failed'] = True + print "Failed" + log.exception(failure) + self.report['success'] = False return d - - def test_connect_scan(self): - pass diff --git a/ooni/reporter.py b/ooni/reporter.py index 594c6b8..3da1eea 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -24,7 +24,8 @@ try: from scapy.packet import Packet except ImportError: log.err("Scapy is not installed.") - + class Packet(object): + pass from ooni.errors import InvalidOONIBCollectorAddress from ooni.errors import ReportNotCreated, ReportAlreadyClosed

1 0

[ooni-probe/master] Add the file option to the required options.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit ad1a572495111a71756713dc164d85712a155d4d Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 3 11:00:04 2014 +0100 Add the file option to the required options. --- ooni/nettests/blocking/bridge_reachability.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index eb03983..65e968a 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -27,6 +27,8 @@ class BridgeReachability(nettest.NetTestCase): inputFile = ['file', 'f', None, 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + requiredOptions = ['file'] + def setUp(self): self.tor_progress = 0 self.timeout = int(self.localOptions['timeout'])

1 0

[ooni-probe/master] Use log.msg
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 9b7fc3f1205b5db9c6edb38899375daa6b6b98b2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:34:34 2014 +0100 Use log.msg --- ooni/nettests/blocking/bridge_reachability.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index acce3d3..eb03983 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -68,7 +68,7 @@ class BridgeReachability(nettest.NetTestCase): config.save() def updates(prog, tag, summary): - print "Tor progress: %s%%" % prog + log.msg("Tor progress: %s%%" % prog) self.report['tor_progress'] = int(prog) self.report['tor_progress_tag'] = tag self.report['tor_progress_summary'] = summary @@ -77,12 +77,12 @@ class BridgeReachability(nettest.NetTestCase): progress_updates=updates) @d.addCallback def setup_complete(proto): - print "Success" + log.msg("Success") self.report['success'] = True @d.addErrback def setup_failed(failure): - print "Failed" + log.msg("Failed") log.exception(failure) self.report['success'] = False

1 0

[ooni-probe/master] Merge branch 'master' into feature/bridget
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 8c9ee9225720752bf4e938a9d41d39cd5482dce7 Merge: 9b7fc3f efb85ae Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 19:03:07 2014 +0100 Merge branch 'master' into feature/bridget * master: Fix bug in initializing of the test instance. ooni/tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0