Correct the return type on the signature for X509_STORE_CTX_get_ex_data given in the pod file.
Check sk_SSL_CIPHER_num() after assigning sk.
Have the .pc files depend on each other rather than duplicating the
various link settings. PR#3332
Corrected POD syntax errors. PR#3353
Add information to BUGS section of enc documentation. PR#3354
Fix grammar error in verify pod. PR#3355
Enc doesn't support AEAD ciphers.
(cherry picked from commit 09184dddead165901700b31eb39d540ba30f93c5)
Moved note about lack of support for AEAD modes out of BUGS section to SUPPORTED CIPHERS section (bug has been fixed, but still no support for AEAD)
Unit/regression test for TLS heartbeats.

Regression test against CVE-2014-0160 (Heartbleed).

More info: http://mike-bland.com/tags/heartbleed.html

(based on commit 35cb55988b75573105eefd00d27d0138eebe40b1)
Merge branch 'mbland-heartbeat-test-1.0.2' into OpenSSL_1_0_2-stable
Fix a wrong parameter count ERR_add_error_data
Adding padding extension to trace code.
(cherry picked from commit 6db14dbc514d6b8017827baebea4c75af8bb1976)
For portability use BUF_strndup instead of strndup.
(cherry picked from commit dcca7b13e9066443237dd3001ae52fd103151c98)
Don't allocate more than is needed in BUF_strndup().
Fix signed/unsigned warning.
Change default cipher in smime app to des3.

PR#3357
(cherry picked from commit ca3ffd9670f2b589bf8cc04923f953e06d6fbc58)
Fix for PKCS12_create if no-rc2 specified.

Use triple DES for certificate encryption if no-rc2 is
specified.

PR#3357
Fixes to host checking.

Fixes to host checking wild card support and add support for
setting host checking flags when verifying a certificate
chain.
(cherry picked from commit 397a8e747dc3f964196caed5ca4e08d4b598362a)
Implement BUF_strnlen() and use it instead of strlen().
Remove redundant test.