[tor-commits] [tor/master] Merge remote-tracking branch 'public/prop171_v2'

[nickm at torproject.org]

commit 195bcb6150eeaebab31a44998e2c567d78f9b936
Merge: 553ae5d 1017322
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 19 20:43:28 2011 -0400

    Merge remote-tracking branch 'public/prop171_v2'

 changes/prop171          |   22 ++
 doc/tor.1.txt            |  104 +++++++---
 src/common/util.c        |   43 ++++
 src/common/util.h        |    2 +
 src/or/circuitlist.c     |    4 +
 src/or/circuituse.c      |  147 ++++++++++++--
 src/or/config.c          |  451 +++++++++++++++++++++++++++++++++++------
 src/or/config.h          |    2 +
 src/or/connection.c      |  503 ++++++++++++++++++++++++----------------------
 src/or/connection.h      |    1 +
 src/or/connection_edge.c |  229 +++++++++++++++++++++-
 src/or/connection_edge.h |   13 +-
 src/or/directory.c       |    8 +-
 src/or/dnsserv.c         |   29 ++-
 src/or/main.c            |   13 +-
 src/or/main.h            |    1 +
 src/or/or.h              |  161 ++++++++++++++-
 src/or/router.c          |    8 +-
 18 files changed, 1358 insertions(+), 383 deletions(-)