tor

commit 15dc33849eda4fba651bf4096a9e405d737a977b
parent 1216f99534319f4739cd6b90f7aa3633191c2179
Author: teor <teor@torproject.org>
Date:   Wed, 27 Feb 2019 09:38:04 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5

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
@@ -47,7 +47,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