K 10
svn:author
V 3
gjb
K 8
svn:date
V 27
2018-10-08T19:39:05.006780Z
K 7
svn:log
V 296
Fix a mismerge from head to projects/openssl111.

r339213 was cherry-picked back to head from the project branch, which
caused a conflict.  This commit properly records the mergeinfo from
head.

r339205 was missed, and r339214 is required for reintegration.

Sponsored by:	The FreeBSD Foundation

END