tor

commit 92c60b572ce89e6988422df81af7e8fbcbf2d102
parent bcea98a4b41f7e54068ad73f50eb5e0ceb593a12
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 19 Mar 2018 05:39:56 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug25479
 | 
4
++++
M
src/test/bench.c
 | 
2
++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug25479 b/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.
diff --git a/src/test/bench.c b/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);