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

[nickm at torproject.org]

commit eb79dd42e7de31dff636f67e94da055d94558401
Merge: 7121e7b 8920fc5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 22 10:16:07 2013 -0400

    Merge branch 'bug6153_squashed'

 changes/6153_circuittime_accessor |    4 ++
 src/or/channel.c                  |    2 +-
 src/or/circuitbuild.c             |   28 ++++++-----
 src/or/circuitlist.c              |    2 +-
 src/or/circuitstats.c             |   99 ++++++++++++++++++++++++++++++++-----
 src/or/circuitstats.h             |   44 ++++++++++++++---
 src/or/circuituse.c               |   41 ++++++++-------
 src/or/connection_or.c            |    8 +--
 src/or/control.c                  |   21 ++------
 src/or/control.h                  |    4 +-
 src/or/entrynodes.c               |    2 +-
 src/or/networkstatus.c            |    3 +-
 src/or/or.h                       |   25 +---------
 src/or/statefile.c                |    5 +-
 14 files changed, 187 insertions(+), 101 deletions(-)