Merge branch 'm13'

README.rst

 Readme
 ======
 
-`Build
-Status <https://travis-ci.org/https://travis-ci.org/torproject/sbws>`__
-
 Simple Bandwidth Scanner (called ``sbws``) is a Tor bandwidth scanner
 that generates bandwidth files to be used by Directory Authorities.
 
@@ -65,7 +62,7 @@ We waive copyright and related rights in the work worldwide through the
 `CC0-1.0 license <https://creativecommons.org/publicdomain/zero/1.0>`__.
 
 You can find a copy of the CC0 Public Domain Dedication along with this
-software in ./LICENSE.md
+software in ./LICENSE.rst
 
 Authors
 -------

setup.cfg

@@ -3,8 +3,12 @@ name = sbws
 description = Simple Bandwidth Scanner
 author = Matt Traudt, juga
 author_email = {pastly, juga}@torproject.org
+maintainer = Georg Koppen, juga
+maintainer_email = {gk, juga}@torproject.org
+contact = Georg Koppen, juga
+contact_email = {gk, juga}@torproject.org
 license = CC0
-url = gitlab.torproject.org/tpo/network-health/sbws
+url = https://gitlab.torproject.org/tpo/network-health/sbws
 keywords = tor onion bandwidth measurements scanner relay circuit
 classifiers =
     Development Status :: 4 - Beta
@@ -19,12 +23,12 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
-long_description = file: README.md
-license_files = LICENSE.md
+long_description = file: README.rst
+license_files = LICENSE.rst
 project_urls =
-    Documentation = sbws.readthedocs.org
-    Source = gitlab.torproject.org/tpo/network-health/sbws
-    Tracker = gitlab.torproject.org/tpo/network-health/sbws/-/issues
+    Documentation = https://tpo.pages.torproject.net/network-health/sbws
+    Source = https://gitlab.torproject.org/tpo/network-health/sbws
+    Tracker = https://gitlab.torproject.org/tpo/network-health/sbws/-/issues
 
 [options]
 packages = find: