[tor-commits] [tor/master] Fold changes file into changelog