commit 296b7046d0c9da9c12774e1341dd7b9147f82605 Merge: d4d8b0b 2d94c90 Author: Arturo Filastò art@fuffa.org Date: Thu Aug 15 19:26:32 2013 +0200

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

* 'master' of github.com:TheTorProject/ooni-probe: Add disclaimer fixing rights back to upstream master nettests dir changed using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54 Add obfsproxy_binary option to sample config added precise and squeeze support to setup-dependencies.sh

README.md | 9 ++++++++- data/ooniprobe.conf.sample | 1 + inputs/README | 12 ++++++------ setup-dependencies.sh | 30 ++++++++++++++++++------------ 4 files changed, 33 insertions(+), 19 deletions(-)