[tor-commits] [tor/master] nodelist: Remove merge artefact

[dgoulet at torproject.org]

commit 44b4aa82aa0782a0cbf0e9718b8572d78fd794aa
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 3 09:35:45 2021 -0500

    nodelist: Remove merge artefact
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/nodelist/dirlist.c | 2 --
 1 file changed, 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);