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

[Paul Wouters]

New commits:
commit 46b403ee386c1788cd0e078c921c61177f997024
Merge: 8a82952 7c35daa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 20:48:37 2017 -0500

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

commit 8a82952edb2513db2307051cbfe12ba5d94e7b6e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 14:35:02 2017 -0500

    testing: add ikev2-child-ipsec-timer as wip test

commit 17f4215ed6ea72068742f2f4029ba3f558a254c1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 14:34:56 2017 -0500

    testing: added ikev2-child-ipsec-timer

commit 6944a5595ee8ac1718e99a960a88a82790eab25c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Dec 12 14:09:52 2017 -0500

    testing: fix test name of ikev2-child-ipseac-replace-ike