summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-03 07:33:45 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-03 07:33:45 -0400
commit2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8 (patch)
tree73d26e386ba31a172d7cc1cdbc53068e71bb8178 /changes
parenteb604f5faaa588cf6bf0cc81dc5f2a3b9e9f9e4f (diff)
parent4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c (diff)
downloadtor-2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8.tar.gz
tor-2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
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.