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

[Paul Wouters]

New commits:
commit 882af9a83f0aa18f0f5247485a86cd24b76aa9a1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 1 10:28:17 2015 -0400

    fixup CVE cherry-pick to use new v1_payload_desc, not payload_desc

commit dbf8e1a71211bc7bce3a3edafd957e54d1428956
Merge: 3eca211 d1aa9d6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 1 10:24:44 2015 -0400

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

commit 3eca211a6af8d9241486840de170664b9e0ce502
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 1 09:43:25 2015 -0400

    updated changes

commit 9cf95765c4e81bb91be7d257154f0c318f51b315
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon May 25 09:02:44 2015 +0300

    ikev1.c: use tabs intead of spaces

commit 4bf939f248ef56c2a03a418cbe2543ac7a40a7ea
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 24 20:32:02 2015 -0400

    testing: testcase for CVE-2015-3204

commit d64ec2420a21f76d08106a074cbc6b3795810325
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun May 24 20:08:32 2015 -0400

    CVE-2015-3204 process_packet_tail() fix
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit 0f0d92227c7918e8a14b3d04d480e7baa0cfbd90
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun May 24 20:07:17 2015 -0400

    CVE-2015-3204 jam_str() fix
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>