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

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Jan '14

13 Jan '14

commit b40410196e8a3fdfe0247900c440191b2be6fb51 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 16:45:52 2014 +0000 Update translations for whisperback --- ta/ta.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index d441e79..acbb572 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2014-01-13 16:08+0000\n" +"PO-Revision-Date: 2014-01-13 16:33+0000\n" "Last-Translator: jskcse4 <jskcse4(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "" #: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." -msgstr "" +msgstr "ஒரு மறைகுறியாக்கப்பட்ட மின்னஞ்சல் பின்னூட்டம் அனுப்புக." #: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" @@ -124,7 +124,7 @@ msgstr "" #: ../whisperBack/gui.py:395 msgid "translator-credits" -msgstr "" +msgstr "மொழிபெயர்ப்பாளர்-மேம்பாடு" #: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." @@ -197,4 +197,4 @@ msgstr "உதவி" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "அனுப்பு"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Jan '14

13 Jan '14

commit a45d4a7e9289234e651a177e0967adb82e2902d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 16:15:52 2014 +0000 Update translations for whisperback --- ta/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index 9d252e0..d441e79 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2014-01-13 15:37+0000\n" +"PO-Revision-Date: 2014-01-13 16:08+0000\n" "Last-Translator: jskcse4 <jskcse4(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" @@ -93,7 +93,7 @@ msgstr "" #: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "சேமிக்க முடியவில்லை %s." #. XXX: fix string #: ../whisperBack/gui.py:325

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Jan '14

13 Jan '14

commit d3725f4369b4b7473104810b8f17ad79bd307539 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 15:45:52 2014 +0000 Update translations for whisperback --- ta/ta.po | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index 3198abf..9d252e0 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jskcse4 <jskcse4(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2012-02-26 16:11+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-01 15:36+0200\n" +"PO-Revision-Date: 2014-01-13 15:37+0000\n" +"Last-Translator: jskcse4 <jskcse4(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,40 +40,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." msgstr "" -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." -msgstr "" +msgstr "மின்னஞ்சல் அனுப்புகிறது..." -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" -msgstr "" +msgstr "மின்னஞ்சல் அனுப்புகிறது" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." msgstr "" -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." msgstr "" -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." -msgstr "" +msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை." -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." -msgstr "" +msgstr "மின்னஞ்சல் உருவாக்க அல்லது அனுப்ப முடியவில்லை." -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -81,21 +82,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." -msgstr "" +msgstr "உங்கள் தகவல் அனுப்பப்பட்டது." -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." msgstr "" -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." msgstr "" #. XXX: fix string -#: ../whisperBack/gui.py:322 +#: ../whisperBack/gui.py:325 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -105,27 +106,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "" -#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "" -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" msgstr "" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" msgstr "" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr ""

1 0

[ooni-probe/master] Design a set of default test decks.
by art＠torproject.org 13 Jan '14

13 Jan '14

commit d475d641f2d6e6ca8e2609d54163a556bc048ad0 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 13 15:12:00 2014 +0100 Design a set of default test decks. --- data/decks/basic.deck | 24 ------------ data/decks/before_i_commit.testdeck | 36 ------------------ 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 | 10 ++--- data/decks/mlab_no_root.deck | 48 +++++++++++++++++++++++ data/decks/short_no_root.deck | 60 ----------------------------- 9 files changed, 245 insertions(+), 125 deletions(-) diff --git a/data/decks/basic.deck b/data/decks/basic.deck deleted file mode 100644 index 1643f5a..0000000 --- a/data/decks/basic.deck +++ /dev/null @@ -1,24 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null diff --git a/data/decks/before_i_commit.testdeck b/data/decks/before_i_commit.testdeck deleted file mode 100644 index 9a3bca7..0000000 --- a/data/decks/before_i_commit.testdeck +++ /dev/null @@ -1,36 +0,0 @@ -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/captive_portal_test.yamloo - subargs: [] - test_file: manipulation/captiveportal -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/dns_tamper_test.yamloo - subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test_file: blocking/dnsconsistency -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] - test_file: manipulation/http_host -- options: - no-collector: true - collector: null - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/header_field_manipulation.yamloo - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation diff --git a/data/decks/complete.deck b/data/decks/complete.deck new file mode 100644 index 0000000..770b401 --- /dev/null +++ b/data/decks/complete.deck @@ -0,0 +1,72 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/traceroute + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null diff --git a/data/decks/complete_no_root.deck b/data/decks/complete_no_root.deck new file mode 100644 index 0000000..8dbc147 --- /dev/null +++ b/data/decks/complete_no_root.deck @@ -0,0 +1,60 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null diff --git a/data/decks/fast.deck b/data/decks/fast.deck new file mode 100644 index 0000000..ddf3c71 --- /dev/null +++ b/data/decks/fast.deck @@ -0,0 +1,36 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/traceroute + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/fast_no_root.deck b/data/decks/fast_no_root.deck new file mode 100644 index 0000000..69bdf2f --- /dev/null +++ b/data/decks/fast_no_root.deck @@ -0,0 +1,24 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/mlab.deck b/data/decks/mlab.deck index 5d5a299..9564d1b 100644 --- a/data/decks/mlab.deck +++ b/data/decks/mlab.deck @@ -3,7 +3,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -15,7 +15,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -27,7 +27,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -39,7 +39,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 @@ -51,7 +51,7 @@ help: 0 logfile: null no-default-reporter: 0 - parallelism: '10' + parallelism: null pcapfile: null reportfile: null resume: 0 diff --git a/data/decks/mlab_no_root.deck b/data/decks/mlab_no_root.deck new file mode 100644 index 0000000..0ab459e --- /dev/null +++ b/data/decks/mlab_no_root.deck @@ -0,0 +1,48 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_invalid_request_line + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/http_header_field_manipulation + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: manipulation/http_host + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/dnsconsistency + testdeck: null diff --git a/data/decks/short_no_root.deck b/data/decks/short_no_root.deck deleted file mode 100644 index ddd157a..0000000 --- a/data/decks/short_no_root.deck +++ /dev/null @@ -1,60 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [] - test_file: manipulation/captiveportal - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/url_lists_file.txt] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/tcpconnect_host_file.txt] - test_file: blocking/tcpconnect - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] - test_file: blocking/dnsconsistency - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null

1 0

[ooni-probe/master] Update the README section on running test decks to reflect the new decks
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 6fb109c9ad1b57623729703eee47d5221183be2b Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 13 15:18:49 2014 +0100 Update the README section on running test decks to reflect the new decks --- README.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f3551f8..cc54c17 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,39 @@ You will find all the installed decks inside of `/usr/share/ooni/decks`. You may then run a deck by using the command line option `-i`: +As root: ``` -ooniprobe -i /usr/share/decks/basic.deck +ooniprobe -i /usr/share/decks/mlab.deck +``` + +Or as a user: +``` +ooniprobe -i /usr/share/decks/mlab_no_root.deck +``` + +Or: + +As root: +``` +ooniprobe -i /usr/share/decks/complete.deck +``` + +Or as a user: +``` +ooniprobe -i /usr/share/decks/complete_no_root.deck +``` + +The above tests will require around 20-30 minutes to complete depending on your network speed. + +If you would prefer to run some faster tests you should run: +As root: +``` +ooniprobe -i /usr/share/decks/fast.deck +``` + +Or as a user: +``` +ooniprobe -i /usr/share/decks/fast_no_root.deck ``` ### Running net tests

1 0

[ooni-probe/master] Add stable string to changelog
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 24d86161aa2772c110a3e98fe4f1241386ce3583 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 13 14:50:18 2014 +0100 Add stable string to changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c05ec94..70a154f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ooniprobe (1.0.0-rc6-1); urgency=low +ooniprobe (1.0.0-rc6-1) stable; urgency=low * ooniprobe 1.0.0-rc6

1 0

[ooni-probe/master] Update the changelog to fix bug in signing
by art＠torproject.org 13 Jan '14

13 Jan '14

commit e2ad36956a8940ca1f020792b4f8affcc4879c80 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 12 18:32:13 2014 +0100 Update the changelog to fix bug in signing --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7d66611..93abf71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ ooniprobe (1.0.0-rc5-1) UNRELEASED; urgency=low * Initial release. (Closes: #XXXXXX) - -- OONI Developers <ooni-dev(a)lists.torproject.org> Fri, 3 Jan 2014 11:14:46 +0200 + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 3 Jan 2014 11:14:46 +0200

1 0

[ooni-probe/master] Add commands for building ooniprobe debian package.
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 24a0567a6810c63d7257483f2d863575596f9d5f Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 12 17:10:39 2014 +0100 Add commands for building ooniprobe debian package. --- scripts/build-ooniprobe.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/build-ooniprobe.sh b/scripts/build-ooniprobe.sh new file mode 100755 index 0000000..3e616e7 --- /dev/null +++ b/scripts/build-ooniprobe.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +cd ../ +python setup.py sdist +cd dist/ +py2dsc ooniprobe-*.tar.gz +cd deb_dist/ooniprobe-* +rm -rf debian/ +cp -rf ../../../debian ./debian +debuild

1 0

[ooni-probe/master] Only include the GeoIP data file if it does not exist
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 08e11259fb7edf9f44e75a278b849821c09c5fc3 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 12 18:30:15 2014 +0100 Only include the GeoIP data file if it does not exist --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd9ebcf..5f97f42 100644 --- a/setup.py +++ b/setup.py @@ -70,11 +70,12 @@ else: data_files = [( '/usr/share/GeoIP/', [ - 'data/GeoIP.dat', 'data/GeoIPASNum.dat', 'data/GeoLiteCity.dat' ] )] + if not os.path.exists('/usr/share/GeoIP/GeoIP.dat'): + data_files[0][1].append('data/GeoIP.dat') for root, dirs, file_names in os.walk('data/'): files = []

1 0

[ooni-probe/master] Add dnet module to the sys.modules
by art＠torproject.org 13 Jan '14

13 Jan '14

commit 61b27de01f0d10f6f3adc6a48f19f70c76f88ddd Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 12 15:56:22 2014 +0100 Add dnet module to the sys.modules --- ooni/utils/txscapy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 876555b..66a3f22 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -34,7 +34,8 @@ def pcapdnet_installed(): # In debian libdnet is called dumbnet instead of dnet, but scapy is # expecting "dnet" so we try and import it under such name. try: - import dumbnet as dnet + import dumbnet + sys.modules['dnet'] = dumbnet except ImportError: pass try:

1 0