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

[Paul Wouters]

New commits:
commit b369f173ec4bfb054e163424892b37c9fe2c6eb6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Aug 11 16:56:25 2016 -0400

    pluto: remove always NULL peer_id arument from fc_try()

commit f675c18abec0ad46499538f426c47ed68298264e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Aug 11 16:57:56 2016 -0400

    pluto: in fc_try() give +1 prio bonus to not switching connection.
    
    This showed up in netkey-audit-01, which has two connections,
    ikev1 and ikev1-aggr, that only change in aggrmode=yes. It is a
    little odd for it to switch later on when lookin at phase2,
    since phase2 params match both connections, so loading order starts
    to matter.