diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-25 16:58:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-25 16:58:58 -0400 |
| commit | 3e2d061397f451ba7b818d9b5b407523b2be4b89 (patch) | |
| tree | 0b57efac964760808c8de6e3eafcbddfe7a93777 | |
| parent | e32281b00095dbc764e995cf57290c9c1b0c9660 (diff) | |
| parent | 36b2b483082eeb43e2aac80cf72b36b35cb48473 (diff) | |
| download | tor-3e2d061397f451ba7b818d9b5b407523b2be4b89.tar.gz tor-3e2d061397f451ba7b818d9b5b407523b2be4b89.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/bug18668 | 3 | ||||
| -rw-r--r-- | src/test/testing_common.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug18668 b/changes/bug18668 new file mode 100644 index 0000000000..4b186b5c05 --- /dev/null +++ b/changes/bug18668 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; + bugfix on 0.2.8.1-alpha. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index aeb1fa794d..39c3d02ab1 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -242,6 +242,8 @@ main(int c, const char **v) options = options_new(); tor_threads_init(); + network_init(); + struct tor_libevent_cfg cfg; memset(&cfg, 0, sizeof(cfg)); tor_libevent_initialize(&cfg); @@ -284,7 +286,6 @@ main(int c, const char **v) return 1; } rep_hist_init(); - network_init(); setup_directory(); options_init(options); options->DataDirectory = tor_strdup(temp_dir); |