summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-03 07:33:39 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-03 07:33:39 -0400
commit42c6ebda1626371cc6b0fff0cc0710b841936bef (patch)
treef36277e4cfb6c2042c56e17e4e3437cead70d2d7 /changes
parent6443812e343635d0db6ea1aac58b817732b7f29a (diff)
parent16bdbddc2cab90e360002b3440a4ed634e3c87f1 (diff)
downloadtor-42c6ebda1626371cc6b0fff0cc0710b841936bef.tar.gz
tor-42c6ebda1626371cc6b0fff0cc0710b841936bef.zip
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
Diffstat (limited to 'changes')
-rw-r--r--changes/bug20424_029_minimal4
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0000000000..eb7886233e
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+ o Minor bugfixes (compilation):
+ - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+ the compiler not to include the system malloc implementation. Fixes bug
+ 20424; bugfix on 0.2.0.20-rc.