[tor-commits] [tor] 04/04: Merge branch 'tor-gitlab/mr/566'