aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-18 10:14:40 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-18 10:14:40 -0400
commitf8c9cc713d608fcd37d25730e91a88d4a1081f28 (patch)
tree66511f361dc9eb1915a7cc469f1001cf57337dbb /src/or/main.c
parentec8bdc5da81a27fd0d382db689addd8114347e1e (diff)
parentb355ddb20f534d772dcb42737ceb1d0264e2c3f1 (diff)
downloadtor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.tar
tor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 95ac8d616..20a1e086a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2105,8 +2105,7 @@ dumpstats(int severity)
log(severity, LD_GENERAL, "Dumping stats:");
- SMARTLIST_FOREACH(connection_array, connection_t *, conn,
- {
+ SMARTLIST_FOREACH_BEGIN(connection_array, connection_t *, conn) {
int i = conn_sl_idx;
log(severity, LD_GENERAL,
"Conn %d (socket %d) type %d (%s), state %d (%s), created %d secs ago",
@@ -2144,7 +2143,7 @@ dumpstats(int severity)
}
circuit_dump_by_conn(conn, severity); /* dump info about all the circuits
* using this conn */
- });
+ } SMARTLIST_FOREACH_END(conn);
log(severity, LD_NET,
"Cells processed: "U64_FORMAT" padding\n"
" "U64_FORMAT" create\n"