Merge remote-tracking branch 'dgoulet/ticket20700_035_03'

diff --cc src/app/config/config.c
Simple merge

diff --cc src/app/config/or_options_st.h
Simple merge

diff --cc src/lib/crypt_ops/crypto_rand.c
index 78471bf398d862ab16d5a4a39f6acc668e70d2d5,554777cf58ba11e1cbacd614882f4491dc073369..313d829a57609e397d61d2de77a82ec2531d3b75
--- 1/src/lib/crypt_ops/crypto_rand.c
--- 2/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@@ -335,16 -319,14 +335,16 @@@ crypto_strongest_rand_raw(uint8_t *out
   * Try to get <b>out_len</b> bytes of the strongest entropy we can generate,
   * storing it into <b>out</b>.
   **/
- void
- crypto_strongest_rand(uint8_t *out, size_t out_len)
+ MOCK_IMPL(void,
+ crypto_strongest_rand,(uint8_t *out, size_t out_len))
  {
 -#define DLEN SHA512_DIGEST_LENGTH
 +#define DLEN DIGEST512_LEN
 +
    /* We're going to hash DLEN bytes from the system RNG together with some
 -   * bytes from the openssl PRNG, in order to yield DLEN bytes.
 +   * bytes from the PRNGs from our crypto librar(y/ies), in order to yield
 +   * DLEN bytes.
     */
 -  uint8_t inp[DLEN*2];
 +  uint8_t inp[DLEN*3];
    uint8_t tmp[DLEN];
    tor_assert(out);
    while (out_len) {

diff --cc src/test/test_hs_client.c
Simple merge

diff --cc src/test/testing_common.c
Simple merge