[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3