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

[Andrew Cagney]

New commits:
commit 6fff7f18a2b1c679ac9f475d0e6e55a2e9211ede
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 5 21:40:45 2021 -0400

    testing: expect single line established IKEv2 Child SA

commit f780cc1efc6615ad815e743eb194e52bcb28a831
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 5 20:50:02 2021 -0400

    ikev2: merge the two established Child SA Log lines
    
    For instance:
     -002 "west" #2: negotiated connection [192.1.2.45-192.1.2.45:0-65535 0] -> [192.1.2.23-192.1.2.23:0-65535 0]
     -004 "west" #2: IPsec SA established tunnel mode {ESP=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256-NONE NATOA=none NATD=none DPD=passive}
     +004 "west" #2: established Child SA; IPsec tunnel [192.1.2.45-192.1.2.45:0-65535 0] -> [192.1.2.23-192.1.2.23:0-65535 0] {ESP=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256-NONE NATOA=none NATD=none DPD=passive}
    it is a little wordy for now; also update IKE SA to be more consistent
    
    (it turns out the IKE SA responder has has 3 established log lines;
    watch out for that in the test results).