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