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

[dgoulet at torproject.org]

commit 07989171e3fead146911e63f24c2dfcabe39c660
Merge: 5112b6cd4f caa305a5ad
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 20 09:17:06 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40476                  |  11 +--
 changes/ticket40491                  |   7 ++
 src/core/or/connection_edge.c        |  28 +++++++-
 src/feature/dircache/dircache.c      |   2 -
 src/feature/nodelist/networkstatus.c |   2 +
 src/feature/relay/dns.c              |  14 ++--
 src/feature/stats/rephist.c          | 133 +++++++++++++++++++++++++++++++++++
 src/feature/stats/rephist.h          |   3 +
 src/test/test_hs_common.c            |  10 +--
 src/test/test_stats.c                |  78 ++++++++++++++++++++
 10 files changed, 263 insertions(+), 25 deletions(-)