[tor-commits] [bridgedb/develop] Merge branch 'fix/24637' into develop

[isis at torproject.org]

commit 6ace9a350f5f700d9f1f6ff88c6a275c1fb18414
Merge: 91305fa 4c79973
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 20 22:59:15 2017 +0000

    Merge branch 'fix/24637' into develop

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