[tor-commits] [tor/master] Merge branch 'bug31107_040' into bug31107_041