[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1

[juga at torproject.org]

commit 0f5fa3a909ebac176842c76042337ebd479998ec
Merge: 36d96da 316d67f
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 16 11:03:21 2021 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1

 .gitchangelog.rc            |   3 +-
 .gitchangelogrst.tpl        |  12 +-
 .gitlab-ci.yml              |  19 +-
 AUTHORS.md => AUTHORS.rst   |  16 +-
 CHANGELOG.rst               | 607 ++++++++++++++++++++++++++++++++++++++++++++
 LICENSE.md                  |  39 ---
 LICENSE.rst                 | 125 +++++++++
 README.md                   |  71 ------
 README.rst                  |  74 ++++++
 docs/source/AUTHORS.md      |   1 -
 docs/source/AUTHORS.rst     |   1 +
 docs/source/README.md       |   1 -
 docs/source/README.rst      |   1 +
 docs/source/conf.py         |   4 -
 docs/source/documenting.rst |   5 +-
 scripts/maint/release.py    |   7 +-
 setup.cfg                   |   1 -
 17 files changed, 847 insertions(+), 140 deletions(-)