[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5