[tor-commits] [tor/master] Merge branch 'ticket34220_035' into ticket34220_041