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

[D. Hugh Redelmeier]

New commits:
commit b6ddef822f37e081ce34db7e27307c22e0e222a0
Merge: f468ee2 bf9f4f1
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Mar 10 23:40:21 2014 -0400

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

commit f468ee2b05edce111bbcbf192460eee60585e6b7
Merge: d94b1b2 b7858c4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon Mar 10 16:56:01 2014 -0400

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

commit d94b1b2847d8f412917baba3b6ef4736f2044ba3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Mar 9 01:37:54 2014 -0500

    some more merge cleanup

commit ada465f45951d2f38f926757a64f78bf3e46b670
Merge: af22ff9 90221fd
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Mar 9 01:34:23 2014 -0500

    Merge branch 'smoother-nss'
    
    Conflicts caused by PR_ASSERT confusion:
    	programs/pluto/crypt_dh.c
    	programs/pluto/hmac.c
    	programs/pluto/ikev1_quick.c

commit 90221fdae3b59b4e5c96fe8c025999fc08373e89
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Mar 9 01:17:23 2014 -0500

    convert some PR_ASSERT calls to passerts to ease rebasing

commit 9ef87dc5528f70de85b84da18726adc41da9f6d9
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Feb 28 18:35:30 2014 -0500

    fix bug in duplicate_state introduced when simplifying NSS use.

commit ae7e783b4915e275aed0da8c948ea97af50e1b62
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Feb 28 18:34:04 2014 -0500

    slight tidy of programs/pluto/ikev1_quick.c

commit 944c9a31c1e4dff1ab92cdf9c85629b7270a6157
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Feb 18 04:15:35 2014 -0500

    smoother nss:
    Many NSS pointers were passed through chunks making to code confusing
    and brittle.  No longer.
    A side-effect is that this change makes it harder to ditch NSS.