Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0

changes/bug30614

@@ -0,0 +1,4 @@
+  o Minor bugfixes (NetBSD):
+    - Fix usage of minherit() on NetBSD and other platforms that define
+      MAP_INHERIT_{ZERO,NONE} instead of INHERIT_{ZERO,NONE}. Fixes bug
+      30614; bugfix on 0.4.0.2-alpha. Patch from Taylor Campbell.

src/lib/malloc/map_anon.c

@@ -50,11 +50,15 @@
 
 #ifdef INHERIT_ZERO
 #define FLAG_ZERO INHERIT_ZERO
+#elif defined(MAP_INHERIT_ZERO)
+#define FLAG_ZERO MAP_INHERIT_ZERO
 #endif
 #ifdef INHERIT_NONE
 #define FLAG_NOINHERIT INHERIT_NONE
 #elif defined(VM_INHERIT_NONE)
 #define FLAG_NOINHERIT VM_INHERIT_NONE
+#elif defined(MAP_INHERIT_NONE)
+#define FLAG_NOINHERIT MAP_INHERIT_NONE
 #endif
 
 #elif defined(HAVE_MADVISE)