[tor-commits] [bridgedb/master] Merge branch 'task/31780' into develop

[phw at torproject.org]

commit 0751ad7148447f30df7c015c77853d58b6077f71
Merge: e5f83a4 39b6285
Author: Philipp Winter <phw at nymity.ch>
Date:   Thu Oct 3 14:28:02 2019 -0700

    Merge branch 'task/31780' into develop

 CHANGELOG                     |  8 +++++
 bridgedb/main.py              |  2 +-
 bridgedb/metrics.py           | 13 ++++----
 bridgedb/test/test_metrics.py |  4 +--
 doc/bridgedb-metrics-spec.txt | 74 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 91 insertions(+), 10 deletions(-)