[tor-commits] [tor/master] Merge branch 'ticket31372_040' into ticket31372_041