summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-03 09:35:45 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-03 09:35:45 -0500
commit44b4aa82aa0782a0cbf0e9718b8572d78fd794aa (patch)
treeed3554871268aee8302412a42c8cdd40d15ee2bb /src
parent9e91bb31ccf7ed8c221eab47332cca6c88cea162 (diff)
downloadtor-44b4aa82aa0782a0cbf0e9718b8572d78fd794aa.tar.gz
tor-44b4aa82aa0782a0cbf0e9718b8572d78fd794aa.zip
nodelist: Remove merge artefact
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
-rw-r--r--src/feature/nodelist/dirlist.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c
index 4fdc890940..423c4106e2 100644
--- a/src/feature/nodelist/dirlist.c
+++ b/src/feature/nodelist/dirlist.c
@@ -55,8 +55,6 @@ static smartlist_t *fallback_dir_servers = NULL;
static void
add_trusted_dir_to_nodelist_addr_set(const dir_server_t *dir)
{
- tor_addr_t tmp_addr;
-
tor_assert(dir);
tor_assert(dir->is_authority);