[tor-commits] [tor/master] Merge branch 'ticket40237_044_01' into ticket40237_045_01