[tor-commits] [tor/master] in master, remove changes files for already-merged changes