[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet@xxxxxxxxxxxxxx]

commit c1b43d79eb35a33e149ea43d9f431cc8afdcef4c
Merge: fa06aaf7d7 690c7be253
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Mar 10 10:04:26 2021 -0500

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits