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