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

[Paul Wouters]

New commits:
commit 42b7fc1c87bbd37965466f4f67343bc7ceb7542c
Merge: 96885ec 3e0c696
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Nov 21 15:40:19 2017 -0500

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

commit 96885ec7ad1d445f6ebbfbc74896a24014248b55
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Nov 19 13:07:29 2017 +0800

    lib/pluto: remove id_kind() wrapper which just returned id->kind