[tor-commits] [tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3