Merge in relevant changes from the OpenSSL 0.9.6h release.