commit c5da1f1cd52dfbf6dc68fba70df42ec4976a589c Merge: fe2552ad6 065e7da8e Author: George Kadianakis desnacked@riseup.net Date: Mon Mar 4 18:55:28 2019 +0200

Merge branch 'tor-github/pr/723'

src/lib/malloc/map_anon.c | 34 ++++++++++++++++++++++++++++++++-- src/lib/malloc/map_anon.h | 4 ++++ src/test/test_util.c | 34 +++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 11 deletions(-)