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

[phw at torproject.org]

commit 46dde4ce5842a5bf73f16c2c4de451bb5c21dcc4
Merge: 081ff36 5cde59d
Author: Philipp Winter <phw at nymity.ch>
Date:   Thu Aug 15 14:05:05 2019 -0700

    Merge branch 'feature/9316' into develop

 CHANGELOG                                    |  11 +-
 bridgedb.conf                                |  16 +-
 bridgedb/distributors/email/autoresponder.py |  16 +
 bridgedb/distributors/https/server.py        |  11 +
 bridgedb/distributors/moat/server.py         |  15 +
 bridgedb/main.py                             |  55 ++--
 bridgedb/metrics.py                          | 461 +++++++++++++++++++++++++++
 bridgedb/proxy.py                            |  15 +-
 bridgedb/test/test_metrics.py                | 204 ++++++++++++
 scripts/get-tor-exits                        |   2 +-
 10 files changed, 775 insertions(+), 31 deletions(-)