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

[nickm at torproject.org]

commit 8cc8b016c87eea632c46e20d8a2dd053b606655f
Merge: 825f3d3 5412b37
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 30 12:02:13 2011 -0500

    Merge branch 'ipv6_bridges_squashed'

 changes/bug3786          |    7 +
 src/common/address.h     |    7 +
 src/or/circuitbuild.c    |  143 +++++++++----
 src/or/circuitbuild.h    |    6 +-
 src/or/circuituse.c      |    5 +-
 src/or/config.c          |  568 +++++++++++++++++++++++++++++++---------------
 src/or/config.h          |    8 +-
 src/or/connection.c      |  121 +---------
 src/or/connection_edge.c |    4 +-
 src/or/connection_or.c   |   21 +-
 src/or/control.c         |    2 +-
 src/or/directory.c       |   10 +-
 src/or/directory.h       |    2 +-
 src/or/dirserv.c         |    8 +-
 src/or/main.c            |    5 +-
 src/or/nodelist.c        |  113 +++++++--
 src/or/nodelist.h        |   13 +-
 src/or/or.h              |   22 ++-
 src/or/rendclient.c      |    2 +-
 src/or/rendservice.c     |    4 +-
 src/or/router.c          |  113 +++++++++-
 src/or/router.h          |    7 +
 src/or/routerparse.c     |   38 +++
 src/or/transports.c      |    4 +-
 src/test/test_dir.c      |    3 +
 25 files changed, 836 insertions(+), 400 deletions(-)