Sync libcitadel with the one from the libevent-branch