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