[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2