[tor-commits] [ooni-probe/master] Merge branch 'master' into http_requests

commit 5415ecef19eaf6c46ef008595c9f748bae6a640d Merge: f2c0879 3b394e4 Author: Arturo Filastò <art@fuffa.org> Date: Sat Nov 10 15:05:22 2012 +0100 Merge branch 'master' into http_requests * master: Clean up unused code * Fix imports in oonib oonib/__init__.py | 2 +- oonib/config.py | 1 + oonib/models.py | 2 +- oonib/report/api.py | 2 +- oonib/report/models.py | 122 ------------------------------------------------ 5 files changed, 4 insertions(+), 125 deletions(-)