[tor-commits] [bridgedb/master] Merge branch 'feature/31252' into develop

[phw at torproject.org]

commit 8291822c593d8dcf26dbdbc14483c841f6d0ef2e
Merge: 0a1de3f 7ceb25e
Author: Philipp Winter <phw at nymity.ch>
Date:   Fri Aug 16 11:38:23 2019 -0700

    Merge branch 'feature/31252' into develop

 CHANGELOG                             |   9 +++
 bridgedb.conf                         |  19 ++++++
 bridgedb/antibot.py                   | 123 ++++++++++++++++++++++++++++++++++
 bridgedb/distributors/https/server.py |  10 +++
 bridgedb/distributors/moat/server.py  |   6 ++
 bridgedb/main.py                      |   6 ++
 bridgedb/test/test_antibot.py         | 108 +++++++++++++++++++++++++++++
 7 files changed, 281 insertions(+)