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

[asn at torproject.org]

commit 2b97c1dd341f71e6237c97ee73e0f02b7dc6d805
Merge: 45b5987115 d4fbfb54d4
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Jun 28 14:11:46 2021 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/385'

 src/feature/relay/relay_metrics.c |  4 ++--
 src/feature/stats/rephist.c       | 33 ++++++++++++++++++++++++++-------
 src/feature/stats/rephist.h       |  7 +++++--
 3 files changed, 33 insertions(+), 11 deletions(-)