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

[Paul Wouters]

New commits:
commit c3fdc4bb55f8aabeb848913d84a55bf0b2a5b971
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Mar 4 00:08:00 2015 -0500

    testing: fixup DNS and resolv.conf's in baseconfigs

commit 850fd457ee11d049486e203313b03c5b01320c48
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Mar 4 00:06:57 2015 -0500

    testing: swan-transmogrify: install named configs in /etc/bind/
    
    This is done for all hosts, so that anyone can use a nameserver
    on 127.0.0.1 and do opportunistic without the cascade of DNS
    packets interfering.

commit 1753e20f69701984ca6e9aee5f2b8bdc415cb61b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 3 23:58:05 2015 -0500

    testing: named config files update
    
    - Fix TXT records to use chunks of < 255
    - Rename files

commit 591079c2fa7275d719a8827960851ee15284e810
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 3 23:55:50 2015 -0500

    testing: WIP aggr-pluto-03

commit 81d1a7bf5c297cb3d9d9463abd944923d8536aaf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 3 21:37:34 2015 -0500

    testing: aggr-pluto-02 shows new aggr+psk warning

commit 19c5993c2a714e5ca00e5905a23be2341bfa99f4
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 3 21:37:14 2015 -0500

    IKEv1: add warning for using aggressive mode with PSK

commit 8b3983e7a7d7141c6d6c0a17b4d33279fa3ce218
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 3 20:36:37 2015 -0500

    Revert "HappyDance: Calculate Shannon Entropy of PSK and prepare to refuse weak PSKs"
    
    Going to be done differently.
    
    This reverts commit e91abf0f527ccc2aca68d3afad7d0ec72bc8abe3.
    
    Conflicts:
    	lib/libswan/secrets.c