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

[asn at torproject.org]

commit 3b32f2508ca320e63956a3bb746729e1a4fb0190
Merge: e7565855c 409df19b5
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Sep 11 16:19:21 2019 +0300

    Merge branch 'tor-github/pr/1307'

 changes/ticket31673       | 3 +++
 src/lib/meminfo/meminfo.c | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)