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