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

[nickm at torproject.org]

commit 0ce74ec7e026eee301d1bc92963ffc60f6f3cc97
Merge: d51de6027 f0408b844
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 14:43:53 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug28981          | 5 +++++
 src/lib/meminfo/meminfo.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)