[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/51'

Mon Jul 20 20:50:41 UTC 2020

commit f5d773c600e9902f053d03f47b7812bd1f4796b7
Merge: d6570eaf5d a576f37cfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 20 16:50:32 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/51'

 src/app/config/resolve_addr.c           |  41 +++++---
 src/app/config/resolve_addr.h           |   6 ++
 src/feature/client/transports.c         |  21 ++--
 src/feature/control/control_getinfo.c   |   7 +-
 src/feature/dirclient/dirclient.c       |   8 +-
 src/feature/dirclient/dirclient_modes.c |  12 ++-
 src/feature/relay/relay_find_addr.c     | 170 +++++++++++---------------------
 src/feature/relay/relay_find_addr.h     |  15 ++-
 src/feature/relay/router.c              | 161 +++++++++++++++---------------
 src/test/test_config.c                  |  80 ++++-----------
 src/test/test_relay.c                   | 170 ++++++++++++++++++++++++++++++++
 11 files changed, 399 insertions(+), 292 deletions(-)