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

[Andrew Cagney]

New commits:
commit 31e8e119661905dfca425faedf107b03f0d2a976
Merge: 35b9bd6 e2f9eae
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jul 23 21:00:27 2018 -0400

    pstats: maintain separate IKEv[12] counts of IPSEC algorithms
    
    Merge commit 'e2f9eaec9c5d93cf00d90cfa3c8b487bb2680156'

commit e2f9eaec9c5d93cf00d90cfa3c8b487bb2680156
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jul 23 20:58:29 2018 -0400

    pstats: count/list IKEv[12] IPSEC algorithms seperately
    
    This way the bug where IKEv2 only algorithms were being counted
    in a table indexed by an IKEv1 only enum is avoided.

commit 572fe8397890b922534bc61a22e3da5d151b3c34
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jul 23 20:57:51 2018 -0400

    testing: expect separate IKEv[12] IPSEC algorithm lists