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