commit e05f52921835ae024d3a127e496f5a0335d193bd Merge: 6c08785 70a3d94 Author: Arturo Filastò arturo@filasto.net Date: Wed Nov 7 21:37:25 2012 +0100

Merge branch 'wtf'

ooni/utils/assertions.py | 180 ---------------------------------- ooni/utils/config.py | 121 ----------------------- ooni/utils/meta.py | 241 ---------------------------------------------- ooni/utils/onion.py | 17 +++- ooni/utils/process.py | 73 -------------- ooni/utils/timer.py | 107 -------------------- wtf/README | 9 ++ wtf/assertions.py | 180 ++++++++++++++++++++++++++++++++++ wtf/config.py | 66 +++++++++++++ wtf/meta.py | 241 ++++++++++++++++++++++++++++++++++++++++++++++ wtf/process.py | 73 ++++++++++++++ wtf/timer.py | 107 ++++++++++++++++++++ 12 files changed, 692 insertions(+), 723 deletions(-)