commit 1f19b5528f90eed57fdb4a7385eea14a6e5e84de Merge: 7b348e2ef ef3543558 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)