This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 5080a4ff671da572afc0744d79402447ba57096f Merge: 4692cf8688 c8d8fa0d36 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Oct 12 15:52:04 2022 -0400
Merge branch 'maint-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(-)