[tor-commits] [bridgedb/master] Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop

[isis at torproject.org]

commit 35ace70a2e85aadfcad1c55759afd7152d2eaf9a
Merge: 0becb75 164c545
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Mar 19 04:36:49 2015 +0000

    Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop

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