commit 5a950766a3dd1786132de486748da7e30b57d0b2 Merge: 177edfd 645058e Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 10 08:29:53 2015 +0000

Merge branch 'fix/4405-tor-exit-check_2_r1' into develop

lib/bridgedb/Main.py | 16 ---------------- lib/bridgedb/proxy.py | 1 + 2 files changed, 1 insertion(+), 16 deletions(-)