commit ca5e2caf53bf678954d051d8dec469bf6eede0b9 Merge: a32646c2e c6f794326 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 19:05:04 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/bug31570 | 5 +++++ src/lib/malloc/map_anon.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)