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

[dgoulet at torproject.org]

commit 077e895934c02fd66321800fef55c9265d94889b
Merge: 2b8af39d86 03c686563b
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Feb 19 13:26:52 2021 +0200

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40295            | 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +++++++++
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)