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

[Andrew Cagney]

New commits:
commit d96eb1a1161daaf10f8ebd9bbecc5b12b6dcbeb2
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Nov 29 13:15:48 2016 -0500

    pluto: set camellia's encrypt_desc.common.ikev1_esp_id
    
    Use the IKEv1 value, and not the IKEv2 value found in
    enum ipsec_cipher_algo - the IKEv1 value is what the
    old kernel interfaces expect.