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