commit 4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3 Merge: b5f3a3d6a 4417ac880 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 19 11:49:20 2019 -0500

Merge branch 'bug29145_029' into maint-0.4.0

changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/test/test-memwipe.c index 15e6a03d8,c650b99c8..43754ed1c --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -44,10 -36,11 +44,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ }

-#ifdef __OpenBSD__ +#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