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

[Paul Wouters]

New commits:
commit 89eba1449946eaf5e5c79c3eada0cca11c4fc019
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jan 22 23:18:35 2018 -0500

    pluto: use correct lock file suffix (.pid, not .lock)
    
    Introduced (by me) in commit e0a15de3 when we added support for
    --rundir and --ctlsocket.

commit fd606e054b4635d41534b6f50d55dcb45d42411c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jan 22 23:04:31 2018 -0500

    pluto: the -V option did not set vendorid, but coredir by mistake.
    
    Mistake introduced (by me) in commit 9076d0fd which added this support.