commit 557bc747f3ef7d3e07965c31343f71143d0a9770 Merge: d006cb25b ff5220536 Author: teor <teor@torproject.org> Date: Wed Feb 12 12:22:08 2020 +1000 Merge branch 'maint-0.4.2' into release-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(-)