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

[Paul Wouters]

New commits:
commit 37aae615bc29350be0a1aef435bacb0c43cf0f25
Merge: 2630088 75b1453
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 3 20:27:27 2015 -0400

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

commit 2630088cab5ab0c597c108a6a1bf37f376409c24
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 3 19:27:50 2015 -0400

    _stackmanager: set /proc/sys/net/core/xfrm_acq_expires to 300
    
    This timeout is used for two things:
    
    - Timeout of the kernel Bare Shunt for ondemand and Opportunistic
    - Timeout of the reserved kernel SPI for the IPsec SA's
    
    300 seconds gives enough time to talk to embedded systems that
    are slow in doing DH as part of IKE

commit 1fffc7dba90af9736aa38c8a89e735b8665aaf81
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 3 19:25:32 2015 -0400

    _stackmanager: remove proc settings for obsoleted loopback ipsec