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

[art at torproject.org]

commit 6e30857efa9223f3852d9e0d42bd02f14ee1b76e
Merge: 10c63e0 7d6901f
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Nov 9 17:40:25 2012 +0100

    Merge branch 'cleanup'
    
    * cleanup:
      Do a very big cleanup and refactor of all the code in the repo.
    
    Conflicts:
    	to-be-ported/protocols/daphn3.py

 to-be-ported/protocols/daphn3.py |  311 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 311 insertions(+), 0 deletions(-)