[tor-commits] [tor/master] Combine some changelog sections.