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