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

[juga at torproject.org]

commit 4b29a493123eeae886ebecbc07b4d3824e99c38f
Merge: 685c9e7 f82ea6a
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Aug 23 19:15:08 2020 +0000

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

 sbws/config.default.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)