[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket25900_034_01'