[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit f96acf79f4662e31828f71a977e34ad2ba0801f6
Merge: 1e9ad700a1 01c4abc2d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 14:28:19 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40257            |  3 +++
 src/core/mainloop/connection.c |  2 ++
 src/feature/metrics/metrics.c  | 21 ++++++++++++++++++---
 src/feature/metrics/metrics.h  |  1 +
 src/test/test_metrics.c        | 32 +++++++++++++++++++++++++++-----
 5 files changed, 51 insertions(+), 8 deletions(-)