commit c39c9ce26ba2990177e45a4c7bffaed51d88d280 Merge: 028733e8b 52342327c Author: David Goulet dgoulet@torproject.org Date: Thu Sep 12 13:47:09 2019 -0400

Merge branch 'tor-github/pr/1285'

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