diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:59 -0500 |
| commit | 7e2b012b46a4ade2818e47be15d76255cf6f121e (patch) | |
| tree | 2bd0080fa3ff1e58db831caa2c84dfb18ff651dc /src/or/routerlist.c | |
| parent | 52d7af631cb1075289ba519d0c3b89e0b5816f5e (diff) | |
| parent | ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e (diff) | |
| download | tor-7e2b012b46a4ade2818e47be15d76255cf6f121e.tar.gz tor-7e2b012b46a4ade2818e47be15d76255cf6f121e.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2365f28fd2..61b350cd38 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2829,7 +2829,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - 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, allow_invalid, |