tor

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf
parent fb309f6eba01f3a53162e70ebfb74ae7ee46891e
Author: teor <teor@torproject.org>
Date:   Wed, 27 Feb 2019 09:37:36 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3

Diffstat:
A
changes/bug29145
 | 
3
+++
M
src/test/test-memwipe.c
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug29145 b/changes/bug29145
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation, testing):
+    - Silence a compiler warning in test-memwipe.c on OpenBSD.  Fixes
+      bug 29145; bugfix on 0.2.9.3-alpha.  Patch from Kris Katterjohn.
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
@@ -42,7 +42,8 @@ const char *s = NULL;
 #ifdef OpenBSD
 /* Disable some of OpenBSD's malloc protections for this test. This helps
  * us do bad things, such as access freed buffers, without crashing. */
-const char *malloc_options="sufjj";
+extern const char *malloc_options;
+const char *malloc_options = "sufjj";
 #endif
 
 static unsigned