commit a09089c58cc337a6ee90cc6ac889a2fcc950a2a0
Merge: 9f753b3 62b17e8
Author: Isis Lovecruft <[email protected]>
Date: Mon Jan 9 19:58:47 2017 +0000
Merge branch 'release/0.4.0'
CHANGELOG | 24 +++++++++++-----
bridgedb.conf | 10 +++++++
bridgedb/Main.py | 7 +++++
bridgedb/configure.py | 2 +-
bridgedb/parse/blacklist.py | 67 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 102 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
