MFC: r276861, r276863Merge OpenSSL 1.0.1k.
Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Merge OpenSSL 0.9.8x.Reviewed by: stasApproved by: benl (maintainer)MFC after: 3 days
This commit was generated by cvs2svn to compensate for changes in r160814,which included commits to RCS files with non-trunk default branches.
This commit was generated by cvs2svn to compensate for changes in r120631,which included commits to RCS files with non-trunk default branches.
This commit was generated by cvs2svn to compensate for changes in r111147,which included commits to RCS files with non-trunk default branches.
This commit was generated by cvs2svn to compensate for changes in r109998,which included commits to RCS files with non-trunk default branches.