diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-04-25 10:46:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-04-25 10:46:23 -0400 |
commit | 232c9e14a8319040c59fd9da1b5d242a57d10a04 (patch) | |
tree | 87557c905d81379c531416f59c8e4ad538cc7e77 /src/test | |
parent | ec7c512d272d366e8e7de61aaf8108bca0adf957 (diff) | |
parent | 4266ec766af8e210ac52f597699b44818960ee39 (diff) | |
download | tor-232c9e14a8319040c59fd9da1b5d242a57d10a04.tar.gz tor-232c9e14a8319040c59fd9da1b5d242a57d10a04.zip |
Merge branch 'atomic_counters'
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/bench.c | 1 | ||||
-rw-r--r-- | src/test/fuzz/fuzzing_common.c | 1 | ||||
-rw-r--r-- | src/test/testing_common.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/test/bench.c b/src/test/bench.c index 5da9168cdc..a44dc94a61 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -674,6 +674,7 @@ main(int argc, const char **argv) or_options_t *options; tor_threads_init(); + tor_compress_init(); if (argc == 4 && !strcmp(argv[1], "diff")) { init_logging(1); diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index f540176204..7aee92df63 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -96,6 +96,7 @@ static void global_init(void) { tor_threads_init(); + tor_compress_init(); { struct sipkey sipkey = { 1337, 7331 }; siphash_set_global_key(&sipkey); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 0e37e0d154..d3dc761c77 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -245,6 +245,7 @@ main(int c, const char **v) update_approx_time(time(NULL)); options = options_new(); tor_threads_init(); + tor_compress_init(); network_init(); |