commit 8dd9097bdc69c78c1665394408347d33666358ff Merge: 081d84c1d ec57cbf17 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 30 14:35:25 2020 -0400 Merge remote-tracking branch 'dgoulet/ticket40009_045_01' scripts/maint/rename_c_identifier.py | 2 +- src/app/config/resolve_addr.c | 26 ++++++++++++++++++++------ src/feature/client/entrynodes.c | 2 +- src/feature/nodelist/nodelist.c | 10 +++++----- src/feature/nodelist/nodelist.h | 2 +- src/test/test_address.c | 10 +++++----- 6 files changed, 33 insertions(+), 19 deletions(-)