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

[D. Hugh Redelmeier]

New commits:
commit cfa52746b686e4db1860c517792dbf5fd506f7da
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jul 3 02:49:31 2018 -0400

    pluto: POLICY_SHUNT_* part of policy isn't really a set

commit ff51f228d75975accd98629689e54b945c5ee67a
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jul 3 02:39:36 2018 -0400

    pluto: POLICY_FAIL_* part of policy isn't really a set

commit 75cacaf9ba76a901ec36162be389996d159428b4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Jul 3 02:36:16 2018 -0400

    pluto: add_connection: recover from silently bad merge in creating 1dbc99118fe8b1664c94ca0a5272da992b895345
    
    - Thanks to Anthony for discovering that this commit caused problems