[tor-commits] [bridgedb/develop] Merge branch 'defect/29686' into develop

[phw at torproject.org]

commit 7afbe7e2866c7628bc5e40b15618105843486c80
Merge: 2ccf7ef 8105032
Author: Philipp Winter <phw at nymity.ch>
Date:   Mon Apr 6 10:24:31 2020 -0700

    Merge branch 'defect/29686' into develop

 CHANGELOG                                          |  4 ++++
 bridgedb/{Bridges.py => bridgerings.py}            |  4 ++--
 bridgedb/bridges.py                                |  4 ++--
 bridgedb/distributors/email/distributor.py         |  8 ++++----
 bridgedb/distributors/https/distributor.py         | 11 ++++++-----
 bridgedb/distributors/moat/distributor.py          |  5 +++--
 bridgedb/main.py                                   | 18 +++++++++---------
 bridgedb/persistent.py                             | 11 +++++++----
 bridgedb/test/deprecated.py                        |  4 ++--
 bridgedb/test/legacy_Tests.py                      | 12 ++++++------
 bridgedb/test/test_Tests.py                        | 10 +++++-----
 bridgedb/test/test_bridgedb_script.py              |  2 ++
 .../test/{test_Bridges.py => test_bridgerings.py}  | 22 +++++++++++-----------
 bridgedb/test/test_bridges.py                      | 12 ++++++------
 bridgedb/test/test_https_distributor.py            |  4 ++--
 bridgedb/test/util.py                              |  4 ++--
 doc/sphinx/ext/traclinks.py                        |  3 ++-
 ...idgedb.Bridges.rst => bridgedb.bridgerings.rst} |  6 +++---
 doc/sphinx/source/bridgedb.rst                     |  2 +-
 doc/sphinx/source/conf.py                          |  2 +-
 20 files changed, 80 insertions(+), 68 deletions(-)