[tor-commits] [tor/release-0.2.4] Merge branch 'bug9400_024_squashed' into maint-0.2.4