Remove reference to ERR_TXT_MALLOCED in the error library as that is
only used internally. Indicate that returned error data must not be
freed.

(cherry picked from commit cb218267)

(cherry picked from commit 717cc858)

PR#3244
(cherry picked from commit 9614d2c6)

Always add a dynamically loaded ENGINE to list. Otherwise it can cause
problems when multiply loaded, especially if it adds new public key methods.
For all current engines we only want a single implementation anyway.
(cherry picked from commit e933f91f)

(cherry picked from commit 46ab9bbd)

(cherry picked from commit 3323314f)

(cherry picked from commit 0ebc965b)

Conflicts:

	ssl/s3_srvr.c
	ssl/ssl3.h

(cherry picked from commit ec492c8a)

(cherry picked from commit cbb67448)

an algorithm from the supplied engine instead of just the default one.
(cherry picked from commit bb845ee0)

Partial fix for PR#3183.
(cherry picked from commit ba168244)

PR#3178
(cherry picked from commit d0b039d4)

(cherry picked from commit 5edce568)

(cherry picked from commit 4b64e0cb)

(cherry picked from commit 8f4077ca)

(cherry picked from commit eedab524)

(and shave off cycle even from integer-only code)
(cherry picked from commit ad0d2579)

The flag SSL_OP_MSIE_SSLV2_RSA_PADDING hasn't done anything since OpenSSL
0.9.7h but deleting it will break source compatibility with any software
that references it. Restore it but #define to zero.

Fix a limitation in SSL_CTX_use_certificate_chain_file(): use algorithm
specific chains instead of the shared chain.

Update docs.
(cherry picked from commit a4339ea3)

Conflicts:

	CHANGES

(cherry picked from commit e8b0dd57)

When sending an invalid version number alert don't change the
version number to the client version if a session is already
established.

Thanks to Marek Majkowski for additional analysis of this issue.

PR#3191
(cherry picked from commit b77b58a3)

PR: 3202
(cherry picked from commit 926725b3)

(cherry picked from commit 2218c296)

For DTLS we might need to retransmit messages from the previous session
so keep a copy of write context in DTLS retransmission buffers instead
of replacing it after sending CCS. CVE-2013-6450.
(cherry picked from commit 34628967)

(cherry picked from commit a6c62f0c)

(and ensure stack alignment in the process)
(cherry picked from commit fc0503a2)