commit a1d8409ee28b609a7d6a1a138a53628cb214a113 Merge: bad001080 bdf685e47 Author: teor teor@torproject.org Date: Mon Aug 12 09:55:29 2019 +1000

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

changes/bug30614 | 4 ++++ src/lib/malloc/map_anon.c | 4 ++++ 2 files changed, 8 insertions(+)