[tor-commits] [tor/master] Merge branch 'mr/252' into maint-0.4.5