[tor-commits] [tor/master] Merge branch 'tor-github/pr/1318'

[asn at torproject.org]

commit bdd17da9fdfbe9de0547f27c7a78255a56570aa4
Merge: 286b129b0 0891a31ad
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Sep 16 15:19:38 2019 +0300

    Merge branch 'tor-github/pr/1318'

 changes/bug31696          |  5 +++++
 src/lib/malloc/map_anon.c | 21 ++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)