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

[dgoulet at torproject.org]

commit fc080b4113c769bd75b81ef4ba571c8df96f5a7b
Merge: 05564a8521 690c7be253
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Mar 10 10:04:26 2021 -0500

    Merge branch 'maint-0.4.5'

 changes/bug40315             | 5 +++++
 src/lib/meminfo/.may_include | 1 +
 src/lib/meminfo/meminfo.c    | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)