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