Merge branch 'maint-0.2.9' into maint-0.3.3

diff --cc src/test/test-memwipe.c
index 89d946d5068deef6e303cf503aed7f5e7abc6f00,c650b99c85ff1f29b1ad648b8ecdb25a7b7f6ab0..4beb613693d75744ae5ee9e03bef8973976cb691
--- 1/src/test/test-memwipe.c
--- 2/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