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

[Paul Wouters]

New commits:
commit 049ce49da20d095f6ed1381e29cd2e467468f77a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 6 21:25:13 2018 -0400

    pluto: move ISAKMP_SA_established() from initiate.c to state.c
    
    It is used on the responder as well, so the placement was very
    misleading.

commit 805da36a8ad6009523e55d4ce38954b1ec844290
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 6 21:13:09 2018 -0400

    pluto: fixup deleting replaced connections
    
    This was already done in ISAKMP_SA_established() but for IKEv2
    it also tried to do it in process_initial_contact()
    
    Instead, fixup the first one to take into account INITIAL_CONTACT.
    
    Since we ignore those for IKEv1, only take it into account for IKEv2