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