[tor-commits] [tor] 12/15: Merge branch 'tor-gitlab/mr/650' into maint-0.4.7