[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6252_again' into maint-0.2.3