Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.Prune svn:mergeinfo from the new branch, as nothing has been mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Merge OpenSSL 1.0.2d.
Merge OpenSSL 1.0.1m.
Merge OpenSSL 0.9.8p into head.Security: CVE-2010-3864Security: http://www.openssl.org/news/secadv_20101116.txt
Merge OpenSSL 0.9.8k into head.Approved by: re
Re-enable keyword expansion, at least for now. Having keywordexpension disabled on the vendor tree means merges to headremoves the attributes there which clutters the merge.
Vendor import of OpenSSL 0.9.8i.