[tor-commits] [tor/maint-0.2.7] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7