commit 09a62d48ce29e49235ca021dfb03838953eae0af
Merge: b98a543 be7550e
Author: Isis Lovecruft <i...@torproject.org>
Date: Thu Sep 8 22:27:14 2016 +0000
Merge branch 'fix/20088' into develop
bridgedb.conf | 4 ++
bridgedb/Main.py | 172 +++++++++++++++++++++++++++-----------------------
bridgedb/configure.py | 4 +-
requirements.txt | 2 +-
scripts/setup-tests | 6 +-
5 files changed, 103 insertions(+), 85 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
