[tor-commits] [tor/master] Remove changes that are already merged in 0.3.5.x releases