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

[juga at torproject.org]

commit 4106adefb1ac52ddb4b88dc381122224500961b1
Merge: 4bed2ce bb2a3c6
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Aug 22 13:06:46 2020 +0000

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

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