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