commit 34ad10db54a76ed23ea377b24769cbc60036d49d Merge: a9e3f73d67 eb1759633a Author: David Goulet dgoulet@torproject.org Date: Mon Mar 1 08:33:47 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

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(-)