[tor-commits] [tor/master] Merge branch 'tor-github/pr/1942'

[dgoulet at torproject.org]

commit 2d9196054059977bea58d2aef904c099c750bbc0
Merge: a3b573b39 ac648fa30
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Jun 24 07:44:41 2020 -0400

    Merge branch 'tor-github/pr/1942'

 changes/ticket34067                    |   4 +
 src/feature/relay/circuitbuild_relay.c |   6 +-
 src/feature/relay/relay_periodic.c     |  46 ++++++++---
 src/feature/relay/selftest.c           | 147 ++++++++++++++++++++++++++-------
 src/feature/relay/selftest.h           |  13 ++-
 5 files changed, 169 insertions(+), 47 deletions(-)