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

[dgoulet at torproject.org]

commit dc4f3a219fd5c30f669f10fc72a666d2c17d6cfb
Merge: c370b4a04 366c69502
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jun 25 10:13:04 2020 -0400

    Merge branch 'tor-github/pr/1948'

 changes/feature34068         | 3 +++
 src/feature/relay/selftest.c | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)