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

[Andrew Cagney]

New commits:
commit 65207d48877e20996c8b24e2cffb80ec6ea6ff20
Merge: dff638b 7268bde
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon May 24 17:41:33 2021 -0400

    state: in show state, print short timer names
    
    Merge commit '7268bde19344f6ce859c3771bc19c22d10326e0b'

commit 7268bde19344f6ce859c3771bc19c22d10326e0b
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon May 24 17:39:55 2021 -0400

    testing: expect short state-timer names

commit e58bfa1e82d763ad093b4c23a62e407f03590f1d
Author: Andrew Cagney <cagney at gnu.org>
Date:   Sun May 23 20:44:07 2021 -0400

    state: use short timer names when showing states

commit 808b47bb1059d0837da8ee70218013d27544f423
Author: Andrew Cagney <cagney at gnu.org>
Date:   Sun May 23 20:43:02 2021 -0400

    events: re-order enums: <generic>; <ikev1>; <ikev2>; retain