commit d49e90455c1fd6d66d057b0ba6e6ee4f23129b9f
Merge: 2ae288d bc61afb
Author: Isis Lovecruft <i...@torproject.org>
Date: Tue Jan 23 21:41:55 2018 +0000
Merge branch 'release/0.6.3'
CHANGELOG | 44 ++++++++
bridgedb/Bridges.py | 52 ++++++++--
bridgedb/distributors/email/distributor.py | 2 +-
bridgedb/distributors/https/distributor.py | 2 +-
bridgedb/distributors/https/server.py | 43 ++++++--
bridgedb/distributors/moat/server.py | 1 +
bridgedb/test/test_Bridges.py | 155 +++++++++++++++++++++++++++++
bridgedb/test/test_https_server.py | 11 +-
scripts/externalize-pt-client | 12 +++
scripts/test-moat | 49 +++++++--
10 files changed, 337 insertions(+), 34 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
