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