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

[nickm at torproject.org]

commit 9b9cc6774fe81e5bf68293308f713d19816ff6da
Merge: 3874e74 4a07ea4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 17 15:49:09 2012 -0500

    Merge branch 'ticket7570_7571'
    
    Conflicts:
    	src/or/routerlist.c

 changes/ipv6_automap       |   19 +++
 changes/prop205-simplified |   25 ++++
 doc/tor.1.txt              |   52 +++++++--
 src/or/addressmap.c        |  274 ++++++++++++++++++++++++++++++--------------
 src/or/addressmap.h        |   26 ++++-
 src/or/config.c            |   77 ++++++++++---
 src/or/connection.c        |   14 +++
 src/or/connection_edge.c   |   46 +++++---
 src/or/control.c           |    9 +-
 src/or/or.h                |   64 ++++++++++-
 src/or/relay.c             |   22 +++--
 src/test/test_addr.c       |   71 ++++++++++++
 src/test/test_config.c     |    7 +
 13 files changed, 559 insertions(+), 147 deletions(-)