[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/39'

[dgoulet at torproject.org]

commit 063cdb3142f380ca1167f50d42fb61c2687dbef6
Merge: 6fb163725 fae19df98
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Jul 10 13:12:22 2020 -0400

    Merge branch 'tor-gitlab/mr/39'

 changes/ticket33264              |   4 +
 src/core/mainloop/connection.c   |   7 +-
 src/core/mainloop/mainloop.c     |   3 +-
 src/feature/relay/relay_config.c |   5 +-
 src/feature/stats/connstats.c    | 283 +++++++++++++++++++++++++++++++++++++++
 src/feature/stats/connstats.h    |  25 ++++
 src/feature/stats/include.am     |   2 +
 src/feature/stats/rephist.c      | 223 +-----------------------------
 src/feature/stats/rephist.h      |   8 --
 src/test/test_stats.c            |  45 ++++---
 10 files changed, 350 insertions(+), 255 deletions(-)