[tor-commits] [tor/master] Re-order and combine changelog sections