[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05