commit 2ae288d6f7e3051b3aa3c85e9a8341c3e21baf4b Merge: 9bb5de6 6ace9a3 Author: Isis Lovecruft isis@torproject.org Date: Wed Dec 20 23:07:12 2017 +0000

Merge branch 'release/0.6.2'

README.rst | 34 ++++++------ bridgedb/bridgerequest.py | 9 ++++ bridgedb/distributors/moat/server.py | 73 +++++++++++++++++++++----- bridgedb/test/test_distributors_moat_server.py | 55 +++++++++++++++++-- 4 files changed, 140 insertions(+), 31 deletions(-)