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

[Andrew Cagney]

New commits:
commit cbc5a51842f37fb6110ae05d9bfb8d2593e9221a
Merge: 8f56ffe 966b866
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Aug 17 12:31:21 2018 -0400

    ike_alg: accept chacha20poly1305
    
    Merge commit '966b866b9d6328c8bc4393fe6abbe8426b8f508c'

commit 966b866b9d6328c8bc4393fe6abbe8426b8f508c
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Aug 17 12:18:40 2018 -0400

    ike_alg: fix typo - really accept chacha20poly1305

commit 5c221b69ad65a722b908dea4eb9a6d6ba5efc87e
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Aug 17 12:29:37 2018 -0400

    testing: expect chacha20poly1305 in test output