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