Browse Source

Merge branch 'maint-0.3.3'

Nick Mathewson 7 years ago
parent
commit
92c60b572c
2 changed files with 6 additions and 0 deletions
  1. 4 0
      changes/bug25479
  2. 2 0
      src/test/bench.c

+ 4 - 0
changes/bug25479

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

+ 2 - 0
src/test/bench.c

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