[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4