[tor-commits] [tor] 05/08: Merge branch 'tor-gitlab/mr/565'