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

[juga at torproject.org]

commit 3fcc5892cf33b7920507edd9cca4c76ca5d1a1a1
Merge: 40754a3 8f63394
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jul 21 08:50:08 2020 +0000

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

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