[tor-commits] [tor/master] get rid of already-merged prop221 changes file