Merge branch 'master' into github_master
Merge branch 'master' into github_master
slightly change an error message to be more correct regarding IV
Change variable name from state to from_state in send_notification_from_state()
In send_notification* use notification_t instead of u_int16_t
Removed stub interop-ikev2-strongswan-08-nat-1
Tidy:
- don't test bool's against TRUE or FALSE, use them directly
- testing st->st_clonedfrom != SOS_NOBODY is what IS_CHILD_SA(st) does
- send_notification's type parameter should be notification_t.
  So too for send_notification_from_state and send_notification_from_md
- no caller of send_notification used SPI parameters, so ditch them.
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
init.rhel: try killproc when plutoctl is missing
pluto: allow shutdown command even with bad WHACK_BASIC_MAGIC

This facilitates a better upgrade path from openswan to libreswan,
or the reverse. A newer whack magic will still be able to shutdown
an older magic daemon.
updated changes
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

Conflicts:
	programs/pluto/ikev1_main.c
	programs/pluto/ipsec_doi.h
testing: updated psk-pluto-01
(Mostly) Get rid of really stupid line breaks in the source code:
ones that are unnatural and don't make the resulting lines shorter.
Define memeq: using it should make code clearer.
Protect body of same_chunk with parens.
addconn: ignore obsoleted --defaultroute and --defaultroutenexthop

Some people used these low level options with openswan's version
of addconn. This eases migration from openswan to libreswan.
updated changes
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
SECURITY: patch for CVE-2013-6467 dereferencing missing IKEv2 payloads

This patch introduces the same state machine logic from IKEv1, where
processor functions cannot be called unless the mandatory payloads
are present. Most of this work was done by D. Hugh Redelmeier.