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

[nickm at torproject.org]

commit ef35435584c529906d385b0ce532aa6e43205608
Merge: 34bab120d dc41e6a80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 18:58:43 2019 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.0

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