Merge branch 'trove-2017-012_025' into maint-0.2.5

  o Major bugfixes (security, relay):

    - When running as a relay, make sure that we never build a path through

      ourselves, even in the case where we have somehow lost the version of

      our descriptor appearing in the consensus. Fixes part of bug 21534;

      bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012

      and CVE-2017-8822.

      });

  }

  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,