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

[Paul Wouters]

New commits:
commit 139767ef74a1b572e3092c16771a9768bc35b1e3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Feb 28 19:59:39 2018 -0500

    pluto: fixup call to delete_bare_shunt()
    
    It was changed to use the widened shunt_proto, but it should have
    remained b->transport_proto, because that's what we got from the
    kernel. The installed negotiation_shunt is the wider one (if the
    matched conn has no protoports enabled)