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