[tor-commits] [tor] 05/05: Merge remote-tracking branch 'tor-gitlab/mr/574'