[tor-commits] [tor] 01/03: Merge branch 'maint-0.4.7' into release-0.4.7

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

dgoulet pushed a commit to branch release-0.4.7 in repository tor.

commit 9e9d6f2fe5f579fdc8098cf70fbde279eb58c1eb Merge: f0e0957080 d634a5ebc7 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:35:48 2022 -0500

Merge branch 'maint-0.4.7' into release-0.4.7

changes/ticket40648 | 3 +++ src/core/mainloop/connection.c | 2 -- src/core/or/or_connection_st.h | 2 -- src/feature/relay/ext_orport.c | 13 ------------- src/feature/relay/ext_orport.h | 4 ---- 5 files changed, 3 insertions(+), 21 deletions(-)