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

[ooni-probe/master] Merge pull request #366 from TheTorProject/fix/setup.py
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 3977a879d2685e5a99fec6e7de0ad475a376c071 Merge: 5c9bb4d bdb7896 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Nov 20 16:00:41 2014 +0100 Merge pull request #366 from TheTorProject/fix/setup.py Fix/setup.py MANIFEST.in | 1 + data/ooniprobe.conf.sample | 2 +- ooni/deckgen/cli.py | 1 + ooni/resources/__init__.py | 12 ++++- ooni/resources/update.py | 7 ++- ooni/settings.py | 43 ++++++++-------- ooni/utils/__init__.py | 7 ++- requirements.txt | 1 + setup.py | 122 +++++++++++++++++++++----------------------- 9 files changed, 106 insertions(+), 90 deletions(-)

1 0

[ooni-probe/master] Comment in README about Ubuntu PPA authentication
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 52fb372073fa45fff7009afcbca432dcb8635ab4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Dec 30 16:38:47 2014 +0100 Comment in README about Ubuntu PPA authentication --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 5cb95d4..63b8a6d 100644 --- a/README.rst +++ b/README.rst @@ -104,7 +104,11 @@ If you are running Ubuntu 14.04 LTS you can install it from the PPA sudo add-apt-repository ppa:irl/ooni sudo apt-get update && sudo apt-get install ooniprobe -For other Debian based systems, we also have our own debian repository. To +You will be warned that the packages are unauthenticated. This is due to the +PPA not being signed and is normal behaviour. If you would prefer to verify the +integrity of the package, use our private Debian repository below. + +For other Debian based systems, we also have our own Debian repository. To install it from there run this:: sudo sh -c 'echo "deb http://deb.ooni.nu/ooni wheezy main" >> /etc/apt/sources.list'

1 0

[ooni-probe/master] Updates to Debian based installation instructions in README.rst
by art＠torproject.org 03 Jan '15

03 Jan '15

commit fcd5a230e3e7afb9f970830d9282cfa6198eee03 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Dec 11 23:07:01 2014 +0000 Updates to Debian based installation instructions in README.rst * Added installation instructions for Ubuntu 14.04 LTS via PPA * Fixes to capitalisation * Clarification that the private repository may be useful for systems running Debian derivatives as well as just Debian systems. --- README.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 0b70dc8..5cb95d4 100644 --- a/README.rst +++ b/README.rst @@ -88,18 +88,24 @@ Installation Debian based systems -------------------- -If you are running debian testing or debian unstable you can install ooniprobe +If you are running Debian testing or Debian unstable you can install ooniprobe simply with:: apt-get install ooniprobe -If you are running debian stable you can get it from backports via:: +If you are running Debian stable you can get it from backports via:: sudo sh -c 'echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list' sudo apt-get update && sudo apt-get install ooniprobe +If you are running Ubuntu 14.04 LTS you can install it from the PPA +(https://launchpad.net/~irl/+archive/ubuntu/ooni/):: + + sudo add-apt-repository ppa:irl/ooni + sudo apt-get update && sudo apt-get install ooniprobe -We also have our own debian repository. To install it from there run this:: +For other Debian based systems, we also have our own debian repository. To +install it from there run this:: sudo sh -c 'echo "deb http://deb.ooni.nu/ooni wheezy main" >> /etc/apt/sources.list' gpg --keyserver pgp.mit.edu --recv-key 0x49B8CDF4

1 0

[ooni-probe/master] Merge pull request #369 from irl/master
by art＠torproject.org 03 Jan '15

03 Jan '15

commit ca3423af4aa4ca3d88dcbc4a2caccfd670aba0c6 Merge: f0a489e fcd5a23 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Dec 12 00:23:29 2014 +0100 Merge pull request #369 from irl/master Updates to Debian based installation instructions in README.rst README.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/TheTorProject/ooni-probe
by art＠torproject.org 03 Jan '15

03 Jan '15

commit c1e1a115a8639b6016ace2c8af235c70c710ad7d Merge: 52fb372 ca3423a Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Dec 30 17:35:20 2014 +0100 Merge branch 'master' of https://github.com/TheTorProject/ooni-probe

1 0

[ooni-probe/master] Merge pull request #370 from irl/master
by art＠torproject.org 03 Jan '15

03 Jan '15

commit a609558c3e3b1a4364710440050bdaaacc01c267 Merge: ca3423a c1e1a11 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Dec 30 17:37:09 2014 +0100 Merge pull request #370 from irl/master Add comments in README about PPA package verification README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[ooni-probe/master] Fix misspelling
by art＠torproject.org 03 Jan '15

03 Jan '15

commit bbbf22d688de050da3585a7ea8b2329097e910ae Author: kraai <kraai(a)ftbfs.org> Date: Mon Oct 20 14:14:52 2014 +0000 Fix misspelling --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1299276..bd9be09 100644 --- a/README.rst +++ b/README.rst @@ -64,7 +64,7 @@ To install it from the current master run:: sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip -The run:: +Then run:: mkdir my_decks sudo ooniresources --update-inputs --update-geoip

1 0

[ooni-probe/master] Merge pull request #357 from kraai/fix/missp
by art＠torproject.org 03 Jan '15

03 Jan '15

commit a3ac049160eef53202936b931807c28c1eb0a527 Merge: 8a20cc8 bbbf22d Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Oct 20 16:30:02 2014 +0200 Merge pull request #357 from kraai/fix/missp Fix misspelling README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Remove extra import
by art＠torproject.org 03 Jan '15

03 Jan '15

commit d0ff457e5205048f14d848cc9db510e14a266bba Author: aagbsn <aagbsn(a)extc.org> Date: Sat Oct 25 10:40:59 2014 +0000 Remove extra import --- ooni/oonicli.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 8997fca..279d87c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -127,7 +127,6 @@ def runWithDirector(logging=True, start_tor=True, check_incoherences=True): if config.privacy.includepcap: if hasRawSocketPermission(): - from ooni.utils.txscapy import hasRawSocketPermission from ooni.utils.txscapy import ScapyFactory config.scapyFactory = ScapyFactory(config.advanced.interface) else:

1 0

[ooni-probe/master] Fix typos
by art＠torproject.org 03 Jan '15

03 Jan '15

commit c4efd77a07a0a7dc289f449220ba30c289fbbbd5 Author: Matt Kraai <kraai(a)ftbfs.org> Date: Sat Oct 25 07:35:17 2014 -0700 Fix typos --- README.rst | 6 +++--- data/ooniprobe.conf.sample | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 1299276..3bc22ca 100644 --- a/README.rst +++ b/README.rst @@ -71,16 +71,16 @@ The run:: oonideckgen -o my_decks/ The output from the last command will tell you how to run ooniprobe to perform -the measurment. +the measurement. If you would like to contribute measurements to OONI daily you can also add this to your crontab:: - @daily ooni $THE_OONI_COMMAND + @daily ooniprobe $THE_OONI_COMMAND Run this command to automatically update your crontab:: - (crontab -l 2>/dev/null; echo "@daily ooni $THE_OONI_COMMAND") | crontab - + (crontab -l 2>/dev/null; echo "@daily ooniprobe $THE_OONI_COMMAND") | crontab - Installation ============ diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 5715e3d..8e19995 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -37,7 +37,7 @@ advanced: measurement_timeout: 60 # After how many retries we should give up on a measurement measurement_retries: 2 - # How many measurments to perform concurrently + # How many measurements to perform concurrently measurement_concurrency: 10 # After how may seconds we should give up reporting reporting_timeout: 80

1 0