diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-24 19:49:29 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 19:49:29 -0400 |
| commit | bdc2cefd4e3c6190e74337021889b90be4b6768b (patch) | |
| tree | c01f0954e4562d5ea2e2cf5680e7c941d6178d4c /src | |
| parent | eb3e0e3da300f6c7c4e04386de872b4949a9baaf (diff) | |
| parent | 472696e8e517609d34db4818af7bb4ff6f68a158 (diff) | |
| download | tor-bdc2cefd4e3c6190e74337021889b90be4b6768b.tar.gz tor-bdc2cefd4e3c6190e74337021889b90be4b6768b.zip | |
Merge branch 'maint-0.2.5'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 964b3fcac3..3072effc8f 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3352,7 +3352,7 @@ channel_dump_statistics(channel_t *chan, int severity) U64_PRINTF_ARG(chan->timestamp_recv), U64_PRINTF_ARG(now - chan->timestamp_recv)); tor_log(severity, LD_GENERAL, - " * Channel " U64_FORMAT " last trasmitted a cell " + " * Channel " U64_FORMAT " last transmitted a cell " "at " U64_FORMAT " (" U64_FORMAT " seconds ago)", U64_PRINTF_ARG(chan->global_identifier), U64_PRINTF_ARG(chan->timestamp_xmit), |