[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3