[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2