Merge branch 'maint-0.3.3'

This commit is contained in:
Nick Mathewson 2018-03-19 05:39:56 -04:00
commit 92c60b572c
2 changed files with 6 additions and 0 deletions

4
changes/bug25479 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (benchmarks):
- Fix a crash when running benchmark tests on win32 systems which
was due to an uninitialised mutex before logging and options
were initialised. Fixes bug 25479; bugfix on 0.3.3.3-alpha.

View File

@ -713,6 +713,8 @@ main(int argc, const char **argv)
printf("Couldn't seed RNG; exiting.\n"); printf("Couldn't seed RNG; exiting.\n");
return 1; return 1;
} }
init_protocol_warning_severity_level();
crypto_init_siphash_key(); crypto_init_siphash_key();
options = options_new(); options = options_new();
init_logging(1); init_logging(1);