Merge branch 'maint-0.2.8' into release-0.2.8
This commit is contained in:
commit
3e2d061397
|
@ -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.
|
|
@ -242,6 +242,8 @@ main(int c, const char **v)
|
||||||
options = options_new();
|
options = options_new();
|
||||||
tor_threads_init();
|
tor_threads_init();
|
||||||
|
|
||||||
|
network_init();
|
||||||
|
|
||||||
struct tor_libevent_cfg cfg;
|
struct tor_libevent_cfg cfg;
|
||||||
memset(&cfg, 0, sizeof(cfg));
|
memset(&cfg, 0, sizeof(cfg));
|
||||||
tor_libevent_initialize(&cfg);
|
tor_libevent_initialize(&cfg);
|
||||||
|
@ -284,7 +286,6 @@ main(int c, const char **v)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
rep_hist_init();
|
rep_hist_init();
|
||||||
network_init();
|
|
||||||
setup_directory();
|
setup_directory();
|
||||||
options_init(options);
|
options_init(options);
|
||||||
options->DataDirectory = tor_strdup(temp_dir);
|
options->DataDirectory = tor_strdup(temp_dir);
|
||||||
|
|
Loading…
Reference in New Issue