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

[Paul Wouters]

New commits:
commit 914d7b9e59a0f305f38063221635cf3985a59270
Merge: a184458 2bd134a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 18 10:33:44 2013 -0400

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

commit a18445891a49971402a1f0f10d85d428f9e5f323
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 18 10:29:52 2013 -0400

    pluto: fixup some NSS logging to clarify pointers vs content
    
    Upon reading the logs, some debug statements appeared to be printing
    the content of a struct (eg chunk_t) instead of just the pointer to it,
    likely because with nss we don't have all the content as some of it is
    guarded inside nss and we only have a pointer. for some reason, the
    pointer returned by nss often contains "7f 00 00", so this was causing
    some confusion as being misrepresented as content, for instance with
    the shared secret content itself.
    
    This patch clarifies that by adding "(pointer)" as it was done with
    other nss debug prints.