nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 13:13:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8' into release-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson 2016-05-25 16:58:58 -04:00
commit 3e2d061397
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug18668 Normal file
View File

@ -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.

3
src/test/testing_common.c
View File

@ -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);