[openssl-project] Merge conflicts caused by pull request #5462 - Publish the RAND_DRBG API

[Dr. Matthias St. Pierre]

Hi,

in a few hours I will merge pull request

  #5462 - Publish the RAND_DRBG API

This pull request removes 14 public symbols (symbols RAND_POOL_*, 
numbers 4351 - 4364) and closes the gap by renumbering all following
symbols. Anyone of you who as added new symbols to libcrypto.num in his
pull request will encounter a merge-conflict during his next rebase.

Don't be scared about the size of the conflict, there is a simple
solution: accept all incoming changes (discarding yours) and then run
'make update' again.

HTH,

Matthias