[tor-commits] [tor] 05/05: Merge branch 'maint-0.4.7'

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

dgoulet pushed a commit to branch main in repository tor.

commit f39f8b30f47783d932a78152b84ace535b211cc7 Merge: 560d44b08b e2a94e050d Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Nov 9 15:35:58 2022 -0500

Merge branch 'maint-0.4.7'

changes/ticket40674 | 3 +++ src/core/or/connection_edge.c | 20 ++++++++++++++++++-- src/core/or/connection_edge.h | 14 ++++++++++---- src/feature/relay/dns.c | 8 ++++---- src/test/test_cell_formats.c | 4 ++-- src/test/test_dns.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 68 insertions(+), 12 deletions(-)