[tor-commits] [tor/master] Merge branch 'bug33673_035' into bug33673_041