[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4