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

[gitolite role]

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 8f4f0b54d976d6f71bf5d61b5ccbb744f9197d65
Merge: 2c6018a4a6 c8d8fa0d36
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Oct 12 15:52:04 2022 -0400

    Merge branch 'maint-0.4.7' into release-0.4.7

 changes/ticket40194               |  3 ++
 src/core/mainloop/connection.c    | 16 +++++++--
 src/core/or/connection_edge.c     |  2 ++
 src/core/or/connection_st.h       |  4 +++
 src/core/or/status.c              |  9 +++--
 src/core/or/status.h              |  2 +-
 src/feature/relay/relay_metrics.c | 65 +++++++++++++++++++++++++++++++++
 src/feature/relay/relay_metrics.h |  2 ++
 src/feature/stats/rephist.c       | 76 +++++++++++++++++++++++++++++++++++++++
 src/feature/stats/rephist.h       |  7 ++++
 10 files changed, 180 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.