[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/morestats5'

[nickm at torproject.org]

commit 83d9d72bf3bab62e2659ac7060b874ee5ba1c416
Merge: 9b0a4cb 2e0fad5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 30 22:53:05 2013 -0400

    Merge remote-tracking branch 'karsten/morestats5'

 doc/tor.1.txt                     |   19 +++
 src/or/circuitmux.c               |    2 +-
 src/or/command.c                  |   27 ++++
 src/or/command.h                  |    2 +
 src/or/config.c                   |   24 ++++
 src/or/connection.c               |  180 ++++++++++++++++++++++-
 src/or/connection.h               |    9 ++
 src/or/control.c                  |  274 ++++++++++++++++++++++++++++++++++-
 src/or/control.h                  |   35 +++++
 src/or/main.c                     |    5 +
 src/or/or.h                       |   70 +++++++++
 src/or/relay.c                    |  121 ++++++++++++++--
 src/or/relay.h                    |    3 +-
 src/test/Makefile.nmake           |    6 +-
 src/test/include.am               |    1 +
 src/test/test.c                   |    2 +
 src/test/test_cell_queue.c        |    6 +-
 src/test/test_controller_events.c |  287 +++++++++++++++++++++++++++++++++++++
 18 files changed, 1047 insertions(+), 26 deletions(-)