[tor-commits] [tor/master] Merge branch 'dgoulet/tor-ticket40008_045_01'