[tor-commits] [tor] 03/05: Merge branch 'ticket40674_047_01' into 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 c13dc8b08accf24bd0c8533ecbc1ecd1de314a5a Merge: 780ca741f3 21eac1e8d8 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Nov 9 15:32:18 2022 -0500

Merge branch 'ticket40674_047_01' into maint-0.4.7

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 +++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 12 deletions(-)