[tor-commits] [bridgedb/master] Merge branch 'enhancement/31422' into 'develop'

[phw at torproject.org]

commit 35f1be4cee661fb6a23e37cc102379dace3dbc5e
Merge: ada3bdc ce32921
Author: Philipp Winter <phw at torproject.org>
Date:   Wed Jul 8 20:52:39 2020 +0000

    Merge branch 'enhancement/31422' into 'develop'
    
    Make BridgeDB export internal metrics.
    
    See merge request tpo/anti-censorship/bridgedb!8

 CHANGELOG                                      |   4 +
 bridgedb/distributors/email/autoresponder.py   |  12 +-
 bridgedb/distributors/https/server.py          |  22 ++-
 bridgedb/distributors/moat/server.py           |  47 ++++--
 bridgedb/main.py                               |  17 +++
 bridgedb/metrics.py                            | 199 ++++++++++++++++++++++---
 bridgedb/test/test_distributors_moat_server.py |   8 +-
 bridgedb/test/test_metrics.py                  | 132 ++++++++++++++++
 doc/bridgedb-metrics-spec.txt                  |  92 ++++++++----
 requirements.txt                               |   1 +
 10 files changed, 455 insertions(+), 79 deletions(-)