commit 492625badff5fda089b33debd98b88c1fd092d1b Merge: f0da04bb7b 053e02a487 Author: David Goulet <dgoulet@torproject.org> Date: Wed Jul 22 16:09:11 2020 -0400 Merge branch 'tor-gitlab/mr/74' src/app/config/resolve_addr.c | 1 + src/feature/relay/router.c | 66 ++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 29 deletions(-)