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