[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 54160465df531562e474b76cf03e98ebc9105b61
Merge: f1b6135959 a1c40c8511
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Oct 27 10:46:54 2022 -0400

    Merge branch 'maint-0.4.7' into release-0.4.7

 src/core/or/congestion_control_common.c | 11 ++++++
 src/core/or/congestion_control_common.h |  2 ++
 src/core/or/connection_edge.c           | 10 ++++++
 src/core/or/relay.c                     |  2 +-
 src/core/or/relay.h                     |  2 ++
 src/feature/relay/relay_metrics.c       | 64 +++++++++++++++++++++++++++++++--
 src/feature/relay/relay_metrics.h       |  4 +++
 src/feature/stats/rephist.c             | 45 +++++++++++++++++++++++
 src/feature/stats/rephist.h             |  3 ++
 9 files changed, 140 insertions(+), 3 deletions(-)

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