[tor-commits] [ooni-probe/master] Merge branch 'gsathya', remote-tracking branch 'remotes/gsathya/master' into gsathya

[art at torproject.org]

commit fa6107fdc413f6b95eb649633926aaf478da886c
Merge: 86db406 95dff81
Author: Arturo Filastò <hellais at gmail.com>
Date:   Sun Feb 12 17:14:26 2012 +0100

    Merge branch 'gsathya', remote-tracking branch 'remotes/gsathya/master' into gsathya
    
    Conflicts:
    	refactor/tests/bridget.py

 refactor/TorCtl           |    1 +
 refactor/tests/bridget.py |   12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)