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

[isis at torproject.org]

commit a9732719b14b308f9e2e9af15bda65e2e3dd067a
Merge: 303c3f9 14f8fd1
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Feb 10 02:35:59 2015 +0000

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

 .gitignore                      |    3 +
 bridgedb.conf                   |   23 ++
 lib/bridgedb/Bridges.py         |    3 +-
 lib/bridgedb/Main.py            |   49 ++--
 lib/bridgedb/proxy.py           |  466 ++++++++++++++++++++++++++++++++
 lib/bridgedb/runner.py          |   29 ++
 lib/bridgedb/test/test_proxy.py |  560 +++++++++++++++++++++++++++++++++++++++
 scripts/get-tor-exits           |  199 ++++++++++++++
 setup.py                        |    3 +-
 9 files changed, 1317 insertions(+), 18 deletions(-)