commit 2f78b37b46bedf34534fdb0ab52980b6dbe473c2 Merge: b25e217 29dccd1 Author: Arturo Filastò hellais@torproject.org Date: Sat Jul 21 02:34:38 2012 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

ooni/assets/redirects.yaml | 17 +++ ooni/plugins/b0wser.py | 100 ---------------- ooni/plugins/daphn3.py | 100 ++++++++++++++++ ooni/plugins/httpt.py | 54 ++++++++- ooni/protocols/b0wser.py | 284 -------------------------------------------- ooni/protocols/daphn3.py | 284 ++++++++++++++++++++++++++++++++++++++++++++ ooni/protocols/http.py | 17 +++ oonib/b0wser.py | 33 ----- oonib/daphn3.py | 33 +++++ oonib/oonibackend.py | 6 +- 10 files changed, 507 insertions(+), 421 deletions(-)