Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts:
	src/test/testing_common.c
This commit is contained in:
Nick Mathewson
2015-05-20 15:33:22 -04:00
12 changed files with 191 additions and 225 deletions
+1 -1
View File
@@ -358,7 +358,7 @@ main(int argc, char **argv)
init_logging(1);
crypto_global_init(1, NULL, NULL);
crypto_seed_rng(1);
crypto_seed_rng();
rq = replyqueue_new(as_flags);
tor_assert(rq);