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

[Paul Wouters]

New commits:
commit 11f49f347b9e6b4e7cd2711360e558c799108023
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jul 8 22:40:50 2020 -0400

    pluto: clean up protostack. Rename USE_NETKEY to USE_XFRM
    
    Error when USE_KLIPS or USE_NETKEY is set to true.
    
    Don't silently use XFRM when protostack=klips but throw an error and exit.

commit 2ef6246b27f5bce342d1cbdf84ebd97f0136f8f0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jul 8 22:09:05 2020 -0400

    pluto: remove the nostack options for pluto (protostack values were already removed)