commit e6f5f98b5e322b4ac62f178423a839648ac1d38b Merge: a37f39a 4106ade Author: Georg Koppen gk@torproject.org Date: Sat Aug 22 13:07:17 2020 +0000

Merge branch 'maint-1.1' into master

docs/source/contributing.rst | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)