[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

[nickm at torproject.org]

commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806
Merge: cec42be57 ef3543558
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 18:58:44 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

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