commit 368156fcb79c8c1eb2791b71f47aad5b2f7f0377 Merge: b039d3e80 5d956d797 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 1 10:34:39 2020 -0400

Merge branch 'ticket34137'

changes/ticket34137 | 5 +++ src/core/or/circuitbuild.c | 1 - src/feature/relay/relay_config.c | 2 - src/feature/relay/selftest.c | 93 ++++++++++++++-------------------------- src/feature/relay/selftest.h | 1 - 5 files changed, 38 insertions(+), 64 deletions(-)