[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2