[tor-commits] [tor/master] one more already-merged changes file