commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 18:58:06 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5

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