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

[Paul Wouters]

New commits:
commit 42a46c43be90dda2c9054312ea6ebf915adeabbd
Merge: 61bd40d e0c6962
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Mar 8 18:52:17 2013 -0500

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

commit 61bd40dfbe10337f65e7f690508850a49857e872
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Mar 8 18:49:18 2013 -0500

    * pluto: fixup phread locking using lock_certs_and_keys()/unlock_certs_and_keys()
    
    The code using lock_certs_and_keys()/unlock_certs_and_keys() was commented
    out because it depended on LIBCURL which is not always present. A "fixme"
    warning was issued.
    
    But only the CRL code should depend on LIBCURL. So I re-instated the
    pthread locking by moving these functions from programs/pluto/fetch.c
    to lib/libswan/secrets.c