[tor-commits] [tor] 07/08: Merge branch 'tor-gitlab/mr/561'

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 0f7a1f0351ca88c925641a158cb1c1ea1cc218dc Merge: 2a4663fee8 15e95c3bda Author: David Goulet dgoulet@torproject.org AuthorDate: Mon May 16 08:45:15 2022 -0400

Merge branch 'tor-gitlab/mr/561'

src/core/mainloop/mainloop.c | 12 ++---------- src/lib/malloc/malloc.h | 4 ++++ src/test/test_connection.c | 21 +++++---------------- 3 files changed, 11 insertions(+), 26 deletions(-)