[tor-commits] [tor/master] Merge branch 'ticket31311_041' into ticket31304