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 | fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa (patch) | |
| tree | 1bb4b3739bd2db84ca5bc5752b7eb833c83964eb /src/or/routerlist.c | |
| parent | 25d50decb275854c312c8ee4ce5fd7e3f2945e5c (diff) | |
| parent | ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4 (diff) | |
| download | tor-fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa.tar.gz tor-fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
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 355f8e0fa0..af4f67dc12 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, |