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