commit 8de9321305b3868317d518141f516cb85d7728da
Merge: a333183 829f970
Author: Isis Lovecruft <[email protected]>
Date: Mon Jan 9 19:49:43 2017 +0000
Merge branch 'fix/21162' into develop
bridgedb.conf | 10 +++++++
bridgedb/Main.py | 7 +++++
bridgedb/configure.py | 2 +-
bridgedb/parse/blacklist.py | 67 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 85 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
