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
commitee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4 (patch)
tree077e709933fe62c7e00c8e46702e7c48deff7398 /src/or/routerlist.c
parent500f04a74e22686f7659adecea02569b3459c71b (diff)
parent5fc0587c040339357bc3fc37f1b5474f1c3d1a33 (diff)
downloadtor-ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4.tar.gz
tor-ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
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 0e45f63f70..507580f19e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2817,7 +2817,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
smartlist_add(excludednodes, 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,