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

Paul Wouters paul at vault.libreswan.fi
Sat Mar 9 02:15:12 EET 2013


New commits:
commit b771ac179fab828f4e35d964c3cf472b5217d440
Merge: 9748787 cd4aa64
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Mar 8 19:15:07 2013 -0500

    Merge branch 'fragmentation' of vault.libreswan.fi:/srv/src/libreswan into vault_fragmentation
    
    Conflicts:
    	testing/guestbin/swan-prep

commit 97487873be3fd2846dd3f17b3bf9cea40938b735
Merge: 0b6b498 54ec872
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Mar 8 19:14:13 2013 -0500

    Merge branch 'fragmentation' into vault_fragmentation

commit 54ec872a12a81ed3003155b35ec0d433ad9b362c
Merge: 2b997d7 961dc4e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Mar 8 18:32:24 2013 -0500

    Merge branch 'master' into fragmentation
    
    Conflicts:
    	programs/pluto/demux.h
    	testing/guestbin/swan-prep
    	testing/x509/dist_certs



More information about the Swan-commit mailing list