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

[ooni-probe/master] Fix most of the warnings.
by art＠torproject.org 29 Oct '13

29 Oct '13

commit 0cd6812213b9548946b301c3b9c88a4eb80ad8a6 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Sep 28 22:46:33 2013 +0200 Fix most of the warnings. There is still this error message that is a complete mystery to me. This http://stackoverflow.com/questions/8295644/pypi-userwarning-unknown-distrib… leads me to believe that it should be ok. This http://python-notes.boredomandlaziness.org/en/latest/pep_ideas/core_packagi… makes me want to cry :'( --- MANIFEST.in | 4 ++++ README | 1 + data/ooniprobe.conf.sample | 2 +- setup.py | 10 +++++----- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..0edfe5c --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include README.md ChangeLog.md requirements.txt +recursive-include data/ui * +include data/Makefile +include data/ooniprobe.conf.sample diff --git a/README b/README new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/README @@ -0,0 +1 @@ +README.md \ No newline at end of file diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 3128d3d..a4831e8 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 15 # Specify here a custom data_dir path - data_dir: /usr/share/ooni/ + data_dir: /Users/y/.virtualenvs/ooni/bin/../share/ooni oonid_api_port: 8042 tor: #socks_port: 8801 diff --git a/setup.py b/setup.py index 5ca928d..4443749 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from ooni import __version__ import os from os.path import join as pj import sys -from distutils.core import setup +from setuptools import setup install_requires = [ 'txsocksx>=0.0.2', @@ -47,10 +47,10 @@ with open('requirements.txt') as f: install_requires.append(line) setup( - name="ooni-probe", + name="ooniprobe", version=__version__, - author="Arturo Filastò", - author_email = "art(a)torproject.org", + author="Open Observatory of Network Interference", + author_email = "ooni-dev(a)torproject.org", url="https://ooni.torproject.org/", package_dir={'ooni': 'ooni'}, data_files=data_files, @@ -62,5 +62,5 @@ setup( scripts=["bin/ooniprobe"], dependency_links=dependency_links, - install_requires=install_requires, + install_requires=install_requires )

1 0

[ooni-probe/master] Merge pull request #220 from TheTorProject/fix/update_readme
by art＠torproject.org 29 Oct '13

29 Oct '13

commit f54f4e173ea08ebb94228289da4ebd661f742e92 Merge: d49ebc2 ad046ae Author: aagbsn <aagbsn(a)extc.org> Date: Mon Oct 14 00:47:44 2013 -0700 Merge pull request #220 from TheTorProject/fix/update_readme Update dependencies in README.md README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Update README.md
by art＠torproject.org 29 Oct '13

29 Oct '13

commit 8abf2cf15771e0f127394c3bce9fece9a6b36e38 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Sat Oct 26 11:01:13 2013 +0200 Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dde43f7..6bfb5e2 100644 --- a/README.md +++ b/README.md @@ -246,8 +246,8 @@ For pypcap: git clone https://github.com/hellais/pypcap cd pypcap/ pip install pyrex -make && make install -cd ../ && rm -rf pypcap-read-only +python setup.py install +cd ../ && rm -rf pypcap ``` ## Including your geo data in the test report

1 0

[ooni-probe/master] Merge pull request #221 from TheTorProject/fix/prune_manifest
by art＠torproject.org 29 Oct '13

29 Oct '13

commit 9dc20e25a591b9ffc58a9f1d2c1d5b86328c4ce3 Merge: f54f4e1 48ab5f4 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Oct 14 00:49:32 2013 -0700 Merge pull request #221 from TheTorProject/fix/prune_manifest Exclude component.json and .bowerrc from sdist MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Refactor the code of the post processor to work properly.
by art＠torproject.org 29 Oct '13

29 Oct '13

commit e89163c608f27cd34cd871b6bcb814a24b65c762 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Oct 29 16:48:30 2013 +0100 Refactor the code of the post processor to work properly. --- ooni/nettest.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index eb68182..560e039 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -562,25 +562,16 @@ class NetTest(object): measurement = self.makeMeasurement(klass, method, input) measurements.append(measurement.done) self.state.taskCreated() + measurement.done.addCallback(klass.postProcessor) + if self.report: + @measurement.done.addCallback + def cb(*a): + self.report.write(measurement) + measurement.done.addBoth(self.doneReport) yield measurement # When the measurement.done callbacks have all fired # call the postProcessor before writing the report - if self.report: - post = defer.DeferredList(measurements) - - # Call the postProcessor, which must return a single report - # or a deferred - post.addCallback(klass.postProcessor) - def noPostProcessor(failure, report): - failure.trap(NoPostProcessor) - return report - post.addErrback(noPostProcessor, klass.report) - post.addCallback(self.report.write) - - if self.report and self.director: - #ghetto hax to keep NetTestState counts are accurate - [post.addBoth(self.doneReport) for _ in measurements] self.state.allTasksScheduled()

1 0

[ooni-probe/master] Merge pull request #211 from TheTorProject/feature/support_postprocessor_api
by art＠torproject.org 29 Oct '13

29 Oct '13

commit 01b059921fb471ffef5546580879d84ba9e4a776 Merge: 8abf2cf db70b52 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Tue Oct 29 08:10:59 2013 -0700 Merge pull request #211 from TheTorProject/feature/support_postprocessor_api Feature/support postprocessor api ooni/nettest.py | 34 ++++++++++++++++++++++++---------- ooni/tasks.py | 11 ++++++----- 2 files changed, 30 insertions(+), 15 deletions(-)

1 0

[stem/master] Adding tbbscraper to our examples page
by atagar＠torproject.org 29 Oct '13

29 Oct '13

commit f0c90e2b3f46884fcf710e1895e13a7ab36329f4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 29 08:47:29 2013 -0700 Adding tbbscraper to our examples page Including Zack's project as another example. --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 5caa768..e5c1e6e 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -42,5 +42,6 @@ something you would like to have included on this page then `let me know `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator. `Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-6232/pyentr…>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-7241/first_…>`_. `check_tor <http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=chec…>`_ Nagios check to verify that a relay is participating in the Tor network. +`tbbscraper <https://github.com/zackw/tbbscraper/blob/master/controller/controller.py>`_ Automated website scraper over Tor. =========================================================================================================== ==========

1 0

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

29 Oct '13

commit 17c3f819fda0a81244bf0d0662a53b64d91d2607 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 14:16:12 2013 +0000 Update translations for tails-misc --- sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk.po b/sk.po index 17d1411..4f1197d 100644 --- a/sk.po +++ b/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 12:35+0200\n" -"PO-Revision-Date: 2013-10-29 13:41+0000\n" +"PO-Revision-Date: 2013-10-29 13:50+0000\n" "Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n"

1 0

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

29 Oct '13

commit 792ec188c029d758aa5ff3876e9c17c8850780b4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 13:46:16 2013 +0000 Update translations for tails-misc --- sk.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sk.po b/sk.po index 16764a5..17d1411 100644 --- a/sk.po +++ b/sk.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Michelozzo <michalslovak2(a)hotmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 12:35+0200\n" -"PO-Revision-Date: 2013-09-17 08:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-29 13:41+0000\n" +"Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -320,7 +321,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "error:" -msgstr "" +msgstr "chyba:" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 msgid "Error" @@ -328,7 +329,7 @@ msgstr "Chyba" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69 msgid "warning:" -msgstr "" +msgstr "upozornenie:" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Warning" @@ -359,7 +360,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 msgid "This may take a while, so please be patient." -msgstr "" +msgstr "Toto môže chvíľu trvať, buďte preto prosím trpezlivý." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 msgid "Failed to setup chroot." @@ -382,7 +383,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:234 msgid "Failed to restart Tor." -msgstr "" +msgstr "Nepodarilo sa reštartovať Tor." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:242 msgid ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Oct '13

29 Oct '13

commit 884b2a0703c727855a6320a544f7fb2c4fe45404 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 13:45:54 2013 +0000 Update translations for https_everywhere --- sk/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd index 0439752..a9cfa4d 100644 --- a/sk/https-everywhere.dtd +++ b/sk/https-everywhere.dtd @@ -35,8 +35,8 @@ <!ENTITY https-everywhere.source.unable_to_download "Nie je možné stiahnuť zdroj."> <!ENTITY https-everywhere.popup.title ""> -<!ENTITY https-everywhere.popup.paragraph1 ""> -<!ENTITY https-everywhere.popup.paragraph2 ""> -<!ENTITY https-everywhere.popup.paragraph3 ""> -<!ENTITY https-everywhere.popup.keep ""> -<!ENTITY https-everywhere.popup.revert ""> +<!ENTITY https-everywhere.popup.paragraph1 "Hop! Používali ste stabilnú verziu HTTPS Everywhere, ale možno sme Vás nechtiac aktualizovali na našu najnovšiu vývojovú verziu."> +<!ENTITY https-everywhere.popup.paragraph2 "Chcete prejsť späť na stabilnú?"> +<!ENTITY https-everywhere.popup.paragraph3 "Boli by sme vďační, keby ste pokračovali v používaní našej vývojovej verzie a pomohli nám vylepšiť HTTPS Everywhere! Sem-tam sa môže objaviť niekoľko ďalších chýb, ktoré môžete nahlásiť na https-everywhere(a)eff.org. Ospravedlňujeme sa za nepríjemnosti a ďakujeme že používate HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Chcem zostať na vývojovej verzii"> +<!ENTITY https-everywhere.popup.revert "Stiahni poslednú stabilnú verziu">

1 0