[tor-commits] [tor/release-0.3.3] Merge branch 'bug26535_029' into maint-0.2.9