[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into bug33087_041

[dgoulet at torproject.org]

commit 2c0dfb093e2afb2bd5a06c2f5441d55237729de4
Merge: c8242e4c0 5298113da
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 19:19:38 2020 +1000

    Merge branch 'maint-0.4.1' into bug33087_041

 .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(-)