When changing an existing session's profile, also change its idea of what its original profile (originalAddressBookEntry) was so that when splitting it splits with the new profile instead of the old one. Fixes bug 2632.
Refuse to connect to tmux in aggressive-resize mode
Fix crasher where a CRun attribute's color could get dealloced when another NSColor was created with the same attributes. Not sure why autorelease semantics are violated this way by NSColor. The fix is to explicitly keep a reference to every color used in a run in the CRunStorage object.
Fix merge conflicts
Fix errors in merge