aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-30 12:07:59 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-30 12:07:59 -0500
commitcef844d0179e7ef6721795ef1c449f5e4ed24e73 (patch)
treeaf863c7b215293d1eef3873e5d8e9a2d976e3c68 /src/or/routerlist.c
parent6c355d576354a252c642ff6f3e7781580c007c48 (diff)
parentfd73a168ca5bf8ea6a0fa01878dd16d356d14cfa (diff)
downloadtor-cef844d0179e7ef6721795ef1c449f5e4ed24e73.tar.gz
tor-cef844d0179e7ef6721795ef1c449f5e4ed24e73.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ef1538279a..e92de77cc7 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2839,7 +2839,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
}
} SMARTLIST_FOREACH_END(node);
- if ((r = routerlist_find_my_routerinfo()))
+ /* If the node_t is not found we won't be to exclude ourself but we
+ * won't be able to pick ourself in router_choose_random_node() so
+ * this is fine to at least try with our routerinfo_t object. */
+ if ((r = router_get_my_routerinfo()))
routerlist_add_node_and_family(excludednodes, r);
router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,