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