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

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

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 241749836af6784e1d7e78dde54f1a567242cb2d
Merge: 9dd62fb04b 5b0103cfb4
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Tue Nov 8 15:26:44 2022 -0500

    Merge branch 'maint-0.4.7' into release-0.4.7

 src/core/mainloop/connection.c    | 11 ++---
 src/core/or/connection_edge.c     |  4 +-
 src/core/or/status.c              |  2 +-
 src/feature/relay/relay_metrics.c | 60 +++++++++++++++++++++-----
 src/feature/stats/rephist.c       | 91 +++++++++++++++++++++++++++++++--------
 src/feature/stats/rephist.h       | 12 +++---
 6 files changed, 139 insertions(+), 41 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits