[tor-commits] [tor/release-0.3.2] Merge branch 'bug25105_032' into maint-0.3.2