[tor-commits] [tor/master] sort and coalesce some changelog sections