[tor-commits] [tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/326' into maint-0.4.5

[dgoulet at torproject.org]

commit 97e51dd01b228ecb72c912c6cf3ffae6334c8d07
Merge: bc21ed3290 ad4f87ed3f
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Feb 23 12:27:59 2021 -0500

    Merge branch 'tor-gitlab/mr/326' into maint-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(-)