diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:58:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:58:59 -0500 |
| commit | 66039d98430bfbbc921f386b41366b78579e07f0 (patch) | |
| tree | 35b4b4f71c4c4499cbe6105a5434a3fcb101b30f /src/or/command.c | |
| parent | 30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff) | |
| parent | 989db9aed19f0ca3c93a1638bab4a2b473a94aa9 (diff) | |
| download | tor-66039d98430bfbbc921f386b41366b78579e07f0.tar.gz tor-66039d98430bfbbc921f386b41366b78579e07f0.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/routerparse.c
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 6a3ca130e9..00d9af33fa 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -600,7 +600,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."); |