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