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

[Paul Wouters]

New commits:
commit 1283eaa3e50fb4d2aa4eebfc0f748e6aca33b154
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jan 31 10:40:35 2018 -0500

    pluto: re-allow switching from instance to template
    
    This is required when there are two clients connecting fall under the same
    hostpair (because our hostpair does not take into account ports and IDs)
    
    This can be needed when there are two clients behind the same NAT, and
    also when 1 client has two different conns to the server (eg multi-domain
    hosting).