diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:00:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:00:59 -0500 |
| commit | c5382255bd1f16b718885d4680d28a85d297f117 (patch) | |
| tree | 87cd3bdb912a8958f537af8d3b81fe84aec09c78 /src/or/command.c | |
| parent | a1ceee193bf2017bd7d2115cfa1d718409c11929 (diff) | |
| parent | 40ef9087cf7960ce00cd82aa49309f47c9eb064c (diff) | |
| download | tor-c5382255bd1f16b718885d4680d28a85d297f117.tar.gz tor-c5382255bd1f16b718885d4680d28a85d297f117.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/command.c')
| -rw-r--r-- | src/or/command.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/command.c b/src/or/command.c index 7fe9169c3d..4b70deeef4 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -604,7 +604,8 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) /* Consider all the other addresses; if any matches, this connection is * "canonical." */ tor_addr_t addr; - const uint8_t *next = decode_address_from_payload(&addr, cp, (int)(end-cp)); + const uint8_t *next = + decode_address_from_payload(&addr, cp, (int)(end-cp)); if (next == NULL) { log_fn(LOG_PROTOCOL_WARN, LD_OR, "Bad address in netinfo cell; closing connection."); |