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

[Paul Wouters]

New commits:
commit fc10521c1452c0444552e780ac517437fb708b82
Merge: bb73c56 3e3ff48
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Oct 3 23:08:42 2016 -0400

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit bb73c56f8ee27bd8ba6c845da321c3012c82dfb7
Merge: 32a4568 abadb05
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Oct 2 14:01:41 2016 -0400

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit 32a45686b2d532ebd07a730a458c88d4047d9b6b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Sep 29 22:44:18 2016 -0400

    FIPS: cleanup of max IKE and IPsec lifetimes
    
    - move values from ietf_constants.h to pluto_constants.h
    - enforce 8h max IPsec lifetime in FIPS mode
    - check maximums in confread and add_connection
    - check maximums in parse_ipsec_transform() for FIPS reduction as well/