commit 90bf6d967e636f544945497db3616c06895ba2a3 Merge: a845176 e831ea0 Author: Isis Lovecruft isis@torproject.org Date: Wed Mar 18 01:04:16 2015 +0000

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

lib/bridgedb/proxy.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)