[tor-commits] [tor/maint-0.3.4] Merge branch 'bug26535_032' into maint-0.3.2