Merge branch 'ipv6_exits'

changes/ipv6_exits

changes/split_addressmap

doc/tor.1.txt

src/common/address.c

src/common/address.h

src/or/addressmap.c

src/or/addressmap.h

src/or/buffers.c

src/or/circuituse.c

src/or/config.c

src/or/connection.c

src/or/connection_edge.c

src/or/connection_edge.h

src/or/control.c

src/or/dirserv.c

src/or/dirvote.c

src/or/dirvote.h

src/or/dns.c

src/or/dns.h

src/or/dnsserv.c