[tor-commits] [tor/master] checkpoint: fold in changes files