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

[dgoulet at torproject.org]

commit ca8b90a843b404799550fb88f8542040698d2a94
Merge: 51c76215d ca9a5390f
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Jan 20 10:44:03 2020 -0500

    Merge branch 'tor-github/pr/1668'

 changes/bug32753                 |  3 +++
 src/feature/relay/relay_config.c |  5 ++---
 src/feature/relay/router.c       | 15 ++++++++++-----
 src/test/test_config.c           | 22 +++++++++++++++++++---
 4 files changed, 34 insertions(+), 11 deletions(-)