[tor-commits] [tor/master] Merge branch 'bug31571_041' into bug31571_master