[tor-commits] [oonib/master] Merge branch 'master' of ssh://github.com/TheTorProject/ooni-backend

[art at torproject.org]

commit f547c7e4d9a05250220f29445ebe060bd4e80db4
Merge: 8ff77ca e1d39d3
Author: Debian Live user <amnesia at localhost.localdomain>
Date:   Wed Jan 29 19:39:53 2014 +0000

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

 README.md                    |    2 +-
 data/bouncer.yaml            |    6 +-
 oonib/report/api.py          |    1 +
 oonib/report/handlers.py     |  136 ++++++++++++++++++++++++------------------
 oonib/runner.py              |  106 ++++++++++++++++----------------
 scripts/build_tor2web_tor.sh |    3 +-
 scripts/oonibd               |   65 ++++++++++++++++++++
 7 files changed, 200 insertions(+), 119 deletions(-)