[Swan-commit] Changes to ref refs/heads/libevent

[Antony Antony]

New commits:
commit ae937836a2afd92d03c4b6f158e1abf4ddbaf355
Merge: 7ef5423 8d11aef
Author: Antony Antony <antony at phenome.org>
Date:   Wed Jan 28 23:54:03 2015 -0600

    Merge branch 'libevent' of vault.libreswan.fi:/srv/src/libreswan into libevent
    
    Conflicts:
    	programs/pluto/ikev1.c

commit 7ef5423b72455e631adae6d1908d427b0f3caaa9
Author: Antony Antony <antony at phenome.org>
Date:   Wed Jan 28 23:47:05 2015 -0600

    use type event_callback_routine to declare more call back functions

commit 3c654376496e17e23540bb27c78e756a8f6f6a3a
Author: Antony Antony <antony at phenome.org>
Date:   Wed Jan 28 23:17:33 2015 -0600

    fix a bug in ikev1 margin calculation