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.1m.
Merge conflicts.This is cunning doublespeak for "use vendor code".
Resolve conflicts, and garbage collect some local changes that are nolonger required
Forced commit. This is to try and help folks that used the internationalcrypto repo and have slightly different files but with the same version.cvsup in 'checkout mode' has no trouble with this, but cvs can get reallysilly about it.
Grrr. I hate CVS. These were supposed to be committed when I did theIDEA fix earlier today.Bring back IDEA from the dead (but not compiled by default).