[tor-commits] [bridgedb/master] Merge branch 'fix/22871_r1' into develop

[isis at torproject.org]

commit dda4bbee3c57314b16861304b1490b07b8caed7a
Merge: 3560339 3667a63
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Sep 12 21:33:22 2017 +0000

    Merge branch 'fix/22871_r1' into develop

 .coveragerc                                     |   1 +
 README.rst                                      | 173 +++++
 bridgedb.conf                                   | 104 ++-
 bridgedb/captcha.py                             |   1 -
 bridgedb/configure.py                           |  12 +-
 bridgedb/distributors/__init__.py               |   3 -
 bridgedb/distributors/common/__init__.py        |   2 +
 bridgedb/distributors/common/http.py            |  80 +++
 bridgedb/distributors/email/__init__.py         |  18 +-
 bridgedb/distributors/email/distributor.py      |   3 +
 bridgedb/distributors/https/__init__.py         |   6 +-
 bridgedb/distributors/https/distributor.py      |  11 +
 bridgedb/distributors/https/server.py           |  63 +-
 bridgedb/distributors/moat/__init__.py          |   4 +
 bridgedb/distributors/moat/distributor.py       |  64 ++
 bridgedb/distributors/moat/request.py           | 133 ++++
 bridgedb/distributors/moat/server.py            | 776 ++++++++++++++++++++
 bridgedb/main.py                                |  59 +-
 bridgedb/test/https_helpers.py                  |   5 +-
 bridgedb/test/moat_helpers.py                   | 110 +++
 bridgedb/test/test_distributors_common_http.py  | 100 +++
 bridgedb/test/test_distributors_moat_request.py |  52 ++
 bridgedb/test/test_distributors_moat_server.py  | 918 ++++++++++++++++++++++++
 bridgedb/test/test_https_server.py              |  70 --
 bridgedb/test/test_main.py                      |  65 +-
 scripts/setup-tests                             |   7 +
 setup.py                                        |   2 +
 27 files changed, 2638 insertions(+), 204 deletions(-)