commit 4d2804d5ff5beba979e495e07770d09af4139313 Merge: f2e717b ca3f990 Author: Arturo art@fuffa.org Date: Fri Nov 20 13:50:58 2015 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: (67 commits) Downgrading Twisted version is not needed Remove duplicate package Remove unneeded space Add IRC travis build notifications Add all supported twisted version, revise build dependencies Skip failing tests Proper fix for issue reported by @anadahz in #401 psiphon: fix bug that psiphon hangs ooniprobe -ng Remove script to install psiphon psiphon.py: prepare for merge with master Minor improvements commented on https://github.com/TheTorProject/ooni-probe/pull/410 psiphon: use the python provided by sys.executable change the way HTTP request errors are handled add psiphon_install.sh, code should be improved initial psiphon test. Failure cases doesn't fail propertly Properly add BTC address Update README.rst Update README.rst deal with existing, but empty, reporting.yml Fix misleading error message ...

.travis.yml | 23 +- HACKING | 2 +- README.rst | 17 +- Vagrantfile | 2 +- bin/ooniprobe-dev | 8 +- bin/oonireport | 2 +- data/ooniprobe.1 | 2 +- docs/source/index.rst | 2 +- docs/source/tests/bridge_reachability.rst | 129 +++++++ docs/source/tests/meek_fronted_requests.rst | 176 ++++++++++ ooni/errors.py | 8 +- ooni/geoip.py | 2 +- ooni/nettests/blocking/meek_fronted_requests.py | 2 +- .../experimental/bridge_reachability/echo.py | 2 +- ooni/nettests/manipulation/dns_spoof.py | 2 +- ooni/nettests/scanning/http_url_list.py | 2 +- ooni/nettests/third_party/psiphon.py | 134 ++++++++ ooni/reporter.py | 4 +- ooni/templates/process.py | 23 +- ooni/tests/test_oonicli.py | 4 + ooni/tests/test_settings.py | 4 +- ooni/utils/hacks.py | 27 -- ooni/utils/trueheaders.py | 24 +- ooni/utils/txscapy.py | 2 +- requirements.txt | 2 +- scripts/install.sh | 352 ++++++++++++++++++++ setup.py | 2 +- var/old_notes.txt | 2 +- var/proxooni-spec.txt | 2 +- 29 files changed, 897 insertions(+), 66 deletions(-)