commit ffd6e86de1d8475837c24a993398a14077e826c3 Merge: 44648ea 9ecff4e Author: Georg Koppen gk@torproject.org Date: Sun Aug 9 18:11:48 2020 +0000

Merge branch 'maint-1.1' into master

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