commit 9ecff4e4ed39cbe166bae70403808de2a881c6dd Merge: 3fcc589 20feac8 Author: Georg Koppen gk@torproject.org Date: Sun Aug 9 18:11:19 2020 +0000

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

.gitchangelog.rc | 290 +++++++++++++++++++++++++++++++++++++++++++ .gitchangelogrst.tpl | 34 +++++ docs/source/contributing.rst | 18 +++ scripts/maint/release.py | 159 ++++++++++++++++++++++++ 4 files changed, 501 insertions(+)