commit 9ed3bddfd0022058836d1fd2bd4ba448d300f3b1 Merge: 67b024a 7fdca5a Author: Arturo Filastò arturo@filasto.net Date: Fri Oct 5 14:08:52 2012 +0000

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

pretty weird coflict :P Conflicts: ooni/utils/hacks.py

INSTALL | 6 +- LICENSE | 2 +- ooni/plugins/bridget.py | 496 +++++++++++++++++++++++++++++++ ooni/plugins/new_bridget.py | 528 --------------------------------- ooni/plugoo/assets.py | 6 + ooni/plugoo/tests.py | 1 - ooni/utils/config.py | 68 +++++ ooni/utils/hacks.py | 3 +- ooni/utils/log.py | 10 +- ooni/utils/onion.py | 689 +++++++++++++++++++++++++++++++++++++++++++ ooni/utils/process.py | 54 ++++ ooni/utils/timer.py | 107 +++++++ 12 files changed, 1434 insertions(+), 536 deletions(-)

diff --cc ooni/utils/hacks.py index 674f45e,5ef7c8b..cf5f080 --- a/ooni/utils/hacks.py +++ b/ooni/utils/hacks.py @@@ -11,7 -6,7 +11,8 @@@ def patched_reduce_ex(self, proto) located inside of copy_reg and is called _reduce_ex.

Some background on the issue can be found here: - http://stackoverflow.com/questions/569754/how-to-tell-for-which-object-attri... ++ + http://stackoverflow.com/questions/569754/how-to-tell-for-which-object-attri... http://stackoverflow.com/questions/2049849/why-cant-i-pickle-this-object

There was also an open bug on the pyyaml trac repo, but it got closed because