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

[Andrew Cagney]

New commits:
commit 8cf8f20dfeb7037d0c34dc8de6c84135f8cf375f
Merge: 03dc8d18de eb165331cd
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Feb 17 13:14:06 2022 -0500

    merge: nat: cleanup show connection output
    
    - put dpd and at on separate lines
    - only show ikev1 stuff when ikev1
    - show liveness period

commit eb165331cdb643ac6a3e45f013add6b5a51432c4
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Feb 17 12:59:25 2022 -0500

    testing: expect nat-traversal: and dpd: on separate lines

commit b841e9993682060bc6fa6ee8f9d4c453e81e1865
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Feb 17 10:03:33 2022 -0500

    show: split DPD ant nat-traversal connection info; update nat-traversal
    
    - only mention ikev1 when ikev1; log as ikev1-method=both(rfc+drafts)
    - when liveness enabled, show time and not "yes"