commit ff52205362f5d60c209f298a3e3679bc65bdf539 Merge: 00fe21472 5298113da Author: teor teor@torproject.org Date: Wed Feb 12 12:22:04 2020 +1000

Merge branch 'maint-0.4.1' into maint-0.4.2

.travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)