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

[Paul Wouters]

New commits:
commit 60d8877e69b3ac80d520c7920f3817c5961b6ec3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 13 22:01:42 2018 -0400

    update CHANGES

commit 5df3710b8edd1e46cf6a0f4312496fc743b3f2cf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 13 22:00:34 2018 -0400

    testing: fixup xauth-pluto-22 now that addresspool works properly with PSK

commit 2434f785df20111b48330fd7b98f2f6679eefcaa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 13 21:58:07 2018 -0400

    pluto: Fix addresspool to not share lease for authby=secret
    
    When authby=secret is used, clients either use a GroupID where
    everyone uses the same ID, or they use their IP address as ID,
    but then this clashes for two clients that have the same pre-NAT
    IP address.