[tor-commits] [sbws/master] Merge branch 'maint-1.1' into master

[juga at torproject.org]

commit 44648eadc0b3da18a8378126ba1d79f3f622823b
Merge: ba896c9 3fcc589
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jul 21 11:06:21 2020 +0000

    Merge branch 'maint-1.1' into master

 .gitlab-ci.yml | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tox.ini        |   8 ++--
 2 files changed, 120 insertions(+), 3 deletions(-)