[tor-commits] [lego/master] Merge remote-tracking branch 'gitlab/patch-2'