Commit 27c5deb1 authored by Jérémy Bobbio's avatar Jérémy Bobbio
Browse files

Merge tag 'upstream/1.3.1' 

Upstream version 1.3.1
parents 76ae27f4 74427deb

ChangeLog.rst

+13 −2
Original line number Diff line number Diff line 
Changelog

=========



v1.3.0 (Fri, 27 Mar 2015)

v1.3.1 (Fri, 3 Apr 2015)

------------------------



* Fix bug with --help of oonireport



* Read the home directory from an environement variable



* Expose the inputs_dir and decks_dir from the config file



* Fix bug that leads to some incomplete reports not showing up with oonireport



v1.3.0 (Fri, 27 Mar 2015)

-------------------------



* Add obfs4 bridge reachability support



* Avoid hacking sys.path in bin/* scripts to support running ooniprobe from
@@ -18,7 +29,7 @@ v1.3.0 (Fri, 27 Mar 2015) 
* Handle also unhandled exceptions inside of ooni(deckgen|report|resources)



v1.2.3-rc1 (Wed, 4 Feb 2015)

------------------------

----------------------------

* Restructure directories where ooni software writes/reads from

  https://trac.torproject.org/projects/tor/ticket/14086

PKG-INFO

+32 −772

File changed.

Preview size limit exceeded, changes collapsed.

README.rst

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,13 @@ without installing it is supported with the following commands:: 
    ./setup-dependencies.sh

    python setup.py install



OSX

---



You can install ooniprobe on OSX if you have installed homebrew (http://mxcl.github.io/homebrew) with::



    brew install ooniprobe





Other platforms (with Vagrant)

------------------------------

bin/oonireport

+1 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python

import sys

import exceptions

from twisted.internet import defer, reactor



from ooni.utils import log

data/ooniprobe.conf.sample

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ advanced: 
    reporting_concurrency: 15

    oonid_api_port: 8042

    report_log_file: null

    inputs_dir: null

    decks_dir: null

tor:

    #socks_port: 8801

    #control_port: 8802