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

[Andrew Cagney]

New commits:
commit f0dadc04c20580e1d10df8dec49317abd25d07f2
Merge: b45a1c7cf3 967dad3c71
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Sep 19 15:32:15 2023 -0400

    pluto: add/prefer connection.config.child_sa.encap_proto
    
    Merge commit '967dad3c7101a58d98083988f905408d07dbd7f9'

commit 967dad3c7101a58d98083988f905408d07dbd7f9
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Sep 19 10:05:40 2023 -0400

    pluto: add/prefer connection.config.child_sa.encap_proto

commit 17b8fb4ef7d1634867592f4666280205bd395343
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Sep 18 22:05:19 2023 -0400

    testing: add addconn-34-encap-proto

commit 99345d0bb6d6e1ff9d7e142b64795fdd0bf3b005
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Sep 18 14:58:47 2023 -0400

    constants: make encap_proto an enum_name