commit 0de524513fb2a0e617d0ab5c10a6c358e617887d Merge: a4f68d2 04a6196 Author: Isis Lovecruft isis@torproject.org Date: Fri Nov 2 04:38:14 2012 +0000

* Rebasing all the branches on top of master to include commit histories. * Merge branch 'rebase-bridget'

bin/canary | 27 ++ ooni/bridget/__init__.py | 14 + ooni/bridget/custodiet.py | 421 ++++++++++++++++++++++++ ooni/bridget/tests/__init__.py | 14 + ooni/bridget/tests/bridget.py | 499 ++++++++++++++++++++++++++++ ooni/bridget/utils/__init__.py | 1 + ooni/bridget/utils/inputs.py | 174 ++++++++++ ooni/bridget/utils/interface.py | 54 +++ ooni/bridget/utils/log.py | 98 ++++++ ooni/bridget/utils/nodes.py | 176 ++++++++++ ooni/bridget/utils/onion.py | 686 +++++++++++++++++++++++++++++++++++++++ ooni/bridget/utils/reports.py | 144 ++++++++ ooni/bridget/utils/tests.py | 141 ++++++++ ooni/bridget/utils/work.py | 147 +++++++++ ooni/plugins/bridget.py | 500 ---------------------------- 15 files changed, 2596 insertions(+), 500 deletions(-)