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

[Paul Wouters]

New commits:
commit 936a95ea9bb2b50a8a925f4182e1bf43b5d76330
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 3 14:33:52 2015 -0400

    pluto/whack: remove nflog-all remnants, update whack help and man page

commit fc2bd4eea05e3c87ad201add663902b192cb0734
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 15 00:44:40 2015 -0400

    _updown.netkey: fixup nflog for host-host and net-net tunnels
    
    When a host-host or net-net connection comes up, we call
    route-host/route-client, which is the same target, so we have one addnflog
    entry. But when these go down, we call down-host and down-client, which
    are two different targets in the updown script.
    
    This was found via the nflog-03-conns test case
    
    (TODO: add for v6 targets too)