[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 16430fdaf546cf8a2711a4c87380398bd4358d54
Merge: 2f683465d f0408b844
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 14:43:53 2019 -0500

    Merge branch 'maint-0.3.5'

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