Charybdis commit: Don't send ERR_NICKCOLLISION to a user that will not be killed.
Charybdis commit: whois: Fix UID leak.
Charybdis commit: genssl: use DH params length of 2048 to appease weechat users
Charybdis commit: extensions/m_roleplay: merge in darkmyst changes