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