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

[Andrew Cagney]

New commits:
commit 203943f3d0625b5ec2b7e0c23e2d6164d3733da5
Merge: e77fd26 414dc50
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 10 14:13:40 2017 -0400

    include: fix IKEv1's enum ipsec_cipher_algo's ESP_SEED_CBC and ESP_NULL_AUTH_AES_GMAC

commit 414dc5040342eee5602881580fe73aa6cd85df67
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Aug 8 13:21:57 2017 -0400

    include: make enum ipsec_cipher_algo more consistent with IKEv1
    
    ESP_NULL_AUTH_AES_GMAC 21->23
    ESP_SEED_CBC = 21

commit a8cd84bdabe287353c2cdcf9e48cfe3173eaaa4b
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 10 14:11:36 2017 -0400

    testing: expect ESP_SEED_CBC=21 and ESP_NULL_AUTH_AES_GMAC=23