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

[nickm at torproject.org]

commit 4074ff440e20c6549d8589a4f214791d610e3deb
Merge: ec90ed4 996db75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 1 17:03:12 2013 -0500

    Merge branch 'ticket8081_squashed'

 doc/tor.1.txt            |   13 +--
 src/or/circuitbuild.c    |  270 +++++++++++++++++++++++++++++++---------------
 src/or/circuitbuild.h    |    1 +
 src/or/circuitstats.c    |   10 --
 src/or/circuituse.c      |    8 +-
 src/or/config.c          |   35 ++++++-
 src/or/connection_edge.c |   25 ++---
 src/or/networkstatus.c   |   17 +++-
 src/or/networkstatus.h   |    1 +
 src/or/or.h              |   42 ++++++--
 src/or/routerlist.c      |    2 +-
 src/or/routerparse.c     |    2 +-
 src/or/statefile.c       |    1 +
 13 files changed, 284 insertions(+), 143 deletions(-)