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