[tor-commits] [tor/master] Relabel some changelog items; re-sort them into place