[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/500' into main

[ahf at torproject.org]

commit 193781e6ef8b1236bfd51eab344abcb0e914e168
Merge: 48d778bc32 eb06d52dae
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Dec 15 12:46:18 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/500' into main

 changes/ticket40527                  |  11 ++++
 src/feature/nodelist/networkstatus.c |   1 -
 src/feature/relay/relay_metrics.c    |   2 +-
 src/feature/stats/rephist.c          | 100 ++---------------------------------
 src/feature/stats/rephist.h          |   2 -
 src/test/test_stats.c                |  82 ++--------------------------
 6 files changed, 18 insertions(+), 180 deletions(-)