Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts:
	src/test/testing_common.c

diff --cc src/common/aes.c
Simple merge

diff --cc src/common/crypto.c
Simple merge

diff --cc src/common/crypto.h
Simple merge

diff --cc src/common/tortls.c
Simple merge

diff --cc src/common/tortls.h
Simple merge

diff --cc src/or/main.c
index 3fb7de6f6cdcb9d48cbab0348759f7b4d24f7243,3f785a2759fce398f8769d194423ab8be9cd2098..74e6b33397113d2c1c897ee868dc925ea4a1474a
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -1333,10 -1314,10 +1333,10 @@@ run_scheduled_events(time_t now
       * connection_run_housekeeping() above. */
    }
  
 -  if (time_to_add_entropy < now) {
 -    if (time_to_add_entropy) {
 +  if (time_to.add_entropy < now) {
 +    if (time_to.add_entropy) {
        /* We already seeded once, so don't die on failure. */
-       crypto_seed_rng(0);
+       crypto_seed_rng();
      }
  /** How often do we add more entropy to OpenSSL's RNG pool? */
  #define ENTROPY_INTERVAL (60*60)

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

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

diff --cc src/test/testing_common.c
index 60be4606601e02da13e50566a0f5c7d25e12884f,e0c0046d71cd569cf367feea04870ccf397567c9..7f387c0b3ded7a01fc3006b8ec6304fe386f4eb3
--- 1/src/test/testing_common.c
--- 2/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@@ -269,8 -269,8 +269,8 @@@ main(int c, const char **v
      printf("Can't initialize crypto subsystem; exiting.\n");
      return 1;
    }
 -  crypto_set_tls_dh_prime(NULL);
 +  crypto_set_tls_dh_prime();
-   crypto_seed_rng(1);
+   crypto_seed_rng();
    rep_hist_init();
    network_init();
    setup_directory();

diff --cc src/tools/tor-gencert.c
Simple merge