commit c91498a3287be9717e6a1203e60b9503ad537de8 Merge: 164f62e ad8a95f Author: Philipp Winter phw@nymity.ch Date: Thu Oct 3 15:56:33 2019 -0700
Merge branch 'release-0.8.3'
.test.requirements.txt | 12 +- .travis.requirements.txt | 31 +-- .travis.yml | 28 +-- CHANGELOG | 18 ++ Makefile | 2 +- bridgedb/distributors/email/server.py | 3 +- bridgedb/distributors/https/server.py | 2 +- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++--------------- bridgedb/main.py | 2 +- bridgedb/metrics.py | 13 +- bridgedb/test/test_crypto.py | 2 +- bridgedb/test/test_email_dkim.py | 2 +- bridgedb/test/test_email_server.py | 2 +- bridgedb/test/test_metrics.py | 4 +- bridgedb/test/test_persistent.py | 8 +- bridgedb/translations.py | 2 +- doc/HACKING.md | 17 ++ doc/bridgedb-metrics-spec.txt | 74 ++++++++ requirements.txt | 26 +-- scripts/install-dependencies | 5 +- 22 files changed, 335 insertions(+), 241 deletions(-)
tor-commits@lists.torproject.org