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

[Paul Wouters]

New commits:
commit 07abb6487e38d2f950908a011b4fd27f29bffffa
Merge: 535f992 bbc6577
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 10 13:29:15 2013 -0400

    Merge branch 'master' into addresspool
    
    Conflicts:
    	programs/pluto/log.c

commit 535f992fec90cc345bd7fff20fca1f300faa20a9
Merge: 5ab6b0d 1908334
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 10 13:28:26 2013 -0400

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

commit bbc65776e8896e8f83dab9869f1b49f1a7780932
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 10 13:27:04 2013 -0400

    * pluto: threading cleanup in log.c
    
    Use one mutex for all locks.
    Protect whack_log() with a mutex
    Don't protect fmt_log with mutex
    Change debug_prefix to const
    
    Based on patch by Philippe Vouters

commit e9969f7de062d93a906ca79c80d5687011b67d7f
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Mar 10 18:27:02 2013 +0200

    re-fixed CHANGES for pthread

commit fc06d1ca87c59142a1c1bf609f153a12496b25fc
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Mar 10 18:26:39 2013 +0200

    compiling: correct fix for CFLAGS: -pthread

commit f819a384c8beef5158ed54985748723020c089b9
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Mar 10 17:34:45 2013 +0200

    add info about -pthreads to changelog

commit a47146d38f96abb80da188aee43c3646cf7ce04b
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Mar 10 17:27:16 2013 +0200

    compiling: added -pthreads to CFLAGS

commit 5ab6b0daa3453699df361e61d95ec0a81f874a66
Merge: a68cc32 4a07734
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Mar 9 22:47:38 2013 -0500

    Merge branch 'master' into addresspool

commit a68cc32db2c474be5b68894a6e1833e36bd9f8ea
Merge: 542be8a 664d5c3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Mar 9 22:35:02 2013 -0500

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

commit 542be8ada93e8c8a5f40a1baa0a1c63174694548
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 5 14:49:36 2013 -0500

    * testing: int/string issue in swan-prep

commit 26be1b78c04638d2df1981989ecc5d9fb751a89e
Merge: 026d427 418da26
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 5 14:23:30 2013 -0500

    Merge branch 'master' into addresspool