[tor-commits] [tor/maint-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042