commit 42c6ebda1626371cc6b0fff0cc0710b841936bef Merge: 6443812e3 16bdbddc2 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)