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

[nickm at torproject.org]

commit 860837af822ff046a19de299601db6c70f15da17
Merge: 03c3fa456 dc41e6a80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 18:58:43 2019 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

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