[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

[teor@xxxxxxxxxxxxxx]

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf
Merge: fb309f6eb 4417ac880
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Feb 27 09:37:36 2019 +1000

    Merge branch 'maint-0.2.9' into maint-0.3.3

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

diff --cc src/test/test-memwipe.c
index 89d946d50,c650b99c8..4beb61369
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@@ -39,10 -36,11 +39,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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits