commit 2bc49d3828f71439593c760848e2fc15ee30b67a Merge: fdd4bc3f43 296a557bfc Author: David Goulet dgoulet@torproject.org Date: Mon Mar 1 08:24:28 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)