commit 3008255aea7c0c0ca4aa368e2fc975b932241ee3 Merge: 183d0d30d 52f61ec83 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 12:56:39 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3

changes/bug32588 | 4 ++ src/app/config/config.c | 5 +- src/app/config/config.h | 4 ++ src/feature/relay/router.c | 77 ++++++++++++++++++----------- src/feature/relay/router.h | 2 + src/test/test_config.c | 66 +++++++++++++++++++++++++ src/test/test_router.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 243 insertions(+), 32 deletions(-)