[tor-commits] [tor/master] Merge branch 'bug10402_redux_024' into maint-0.2.4