[tor-commits] [bridgedb/master] Merge branch 'fix/4405-tor-exit-check_2_r1' into develop

[isis at torproject.org]

commit ebae225bb9f74998ead06d145c601ad8b171d5b0
Merge: 3a11cf4 9c33a59
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Feb 11 00:56:04 2015 +0000

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

 lib/bridgedb/test/test_proxy.py |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)