commit 2e38dcb3ffaca6270393c37ce4e33d585e62d5e1 Merge: 8b6b363 4b29a49 Author: Georg Koppen gk@torproject.org Date: Sun Aug 23 19:15:34 2020 +0000

Merge branch 'maint-1.1' into master

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