[tor-commits] [tor/master] Merge branch 'bug33195_035' into bug33195_041