[tor-commits] [tor/master] Merge branch 'ipv6_exits'

[nickm at torproject.org]

commit ca0c71551e519a1d27cec5db9c9e6722a382d19d
Merge: 2cb82c3 1e46952
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 14:45:15 2012 -0500

    Merge branch 'ipv6_exits'

 changes/ipv6_exits           |   18 +
 changes/split_addressmap     |    3 +
 doc/tor.1.txt                |   20 +-
 src/common/address.c         |   41 ++-
 src/common/address.h         |    4 +-
 src/or/addressmap.c          |  974 +++++++++++++++++++++++++++++++
 src/or/addressmap.h          |   44 ++
 src/or/buffers.c             |    1 +
 src/or/circuituse.c          |    1 +
 src/or/config.c              |   54 ++-
 src/or/connection.c          |   11 +
 src/or/connection_edge.c     | 1307 ++++++++++--------------------------------
 src/or/connection_edge.h     |   69 ++-
 src/or/control.c             |    1 +
 src/or/dirserv.c             |    8 +-
 src/or/dirvote.c             |   21 +-
 src/or/dirvote.h             |    5 +-
 src/or/dns.c                 |  852 ++++++++++++++++++++--------
 src/or/dns.h                 |    1 +
 src/or/dnsserv.c             |   10 +-
 src/or/include.am            |    2 +
 src/or/main.c                |    1 +
 src/or/microdesc.c           |    1 +
 src/or/or.h                  |   54 ++-
 src/or/policies.c            |  185 +++++--
 src/or/policies.h            |    6 +-
 src/or/relay.c               |  143 ++++-
 src/or/relay.h               |    2 +
 src/or/router.c              |   59 ++-
 src/or/router.h              |    2 +-
 src/or/routerlist.c          |    1 +
 src/or/routerparse.c         |   38 +-
 src/or/routerset.c           |    1 +
 src/test/include.am          |    1 +
 src/test/test.c              |   18 +-
 src/test/test_addr.c         |  126 ++++-
 src/test/test_cell_formats.c |  386 +++++++++++++
 src/test/test_config.c       |    1 +
 src/tools/tor-resolve.c      |   44 +-
 39 files changed, 3076 insertions(+), 1440 deletions(-)