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

[Paul Wouters]

New commits:
commit 798967995b8efa7f7b2769c20ae131f257835862
Merge: a814bc9 56f60ca
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 16 16:47:00 2016 -0400

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

commit a814bc9ad1440a8ef433f096c90d1346aafbb429
Merge: 9623238 fe74430
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 15 13:05:10 2016 -0400

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

commit 96232381c4f52fb9e09b95168e74ed91ada0f11f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 14 22:45:06 2016 -0400

    minor cleanup/comments for nat_traversal.c

commit 3324d99848e9b50dbb757ca14d275313b1bc57ce
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 14 22:15:14 2016 -0400

    WIP: improve handling of updating state with network info from md

commit 0b704f9526cca25d8ba7412072435e4b117ee8f5
Merge: fc51be6 0d4e34d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 14 20:25:27 2016 -0400

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

commit fc51be6e4facc3a1c6c5075ba7c23bafb713faae
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 14 14:22:45 2016 -0400

    rewrite strange looking compare