commit 83e448dd4d4b324526d01898b5d421e2d11e1bfa Merge: 4400ca83e0 97e51dd01b Author: David Goulet dgoulet@torproject.org Date: Tue Feb 23 12:28:04 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.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(-)