Merge branch 'nodes'

  o Code refactorings

    - Unified our node-listing and selecting logic.  We had at least

      two major ways to look at the question of "which Tor servers do

      we know about": our list of router descriptors, and the current

      consensus.  We're adding a third in microdescriptors.  Having

      so many systems without an abstraction layer over them was

      hurting the codebase.  Now, we have a new "node_t" abstraction

      that presents a consistent interface to a client's view of

      a Tor node, and holds (nearly) all of the mutable state

      formerly in routerinfo_t and routerstatus_t.

  o Minor features

    - The NodeFamily option -- which let you declare that you want to

      consider nodes to be part of a family whether they list themselves

      that way or not -- now allows IP address ranges and country codes.

    constitute a "family" of similar or co-administered servers, so never use

    any two of them in the same circuit. Defining a NodeFamily is only needed

    when a server doesn't list the family itself (with MyFamily). This option

    can be used multiple times.

    can be used multiple times.  In addition to nodes, you can also list

    IP address and ranges and country codes in {curly braces}.

**EnforceDistinctSubnets** **0**|**1**::

    If 1, Tor will not put two servers whose IP addresses are "too close" on

 *  brackets.

 */

const char *

tor_addr_to_str(char *dest, const tor_addr_t *addr, int len, int decorate)

tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len, int decorate)

{

  const char *ptr;

  tor_assert(addr && dest);

int tor_addr_parse_mask_ports(const char *s,

                              tor_addr_t *addr_out, maskbits_t *mask_out,

                              uint16_t *port_min_out, uint16_t *port_max_out);

const char * tor_addr_to_str(char *dest, const tor_addr_t *addr, int len,

const char * tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len,

                             int decorate);

int tor_addr_from_str(tor_addr_t *addr, const char *src);

void tor_addr_copy(tor_addr_t *dest, const tor_addr_t *src);