diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
| commit | acd6a4856bccff92eb241b18066ca7df577ab5f2 (patch) | |
| tree | 153eb944a6f61e3591831b3fde0385ee4e51e5bd /src/or/connection_or.c | |
| parent | e36f9d1d9beec0daed57b68f936293dccc77b171 (diff) | |
| parent | 0b3166fffa0e5e19c63fd95538f87d634444d28c (diff) | |
| download | tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.tar.gz tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection.c
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6d68b0e704..1f2575ae14 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1565,9 +1565,8 @@ connection_or_send_netinfo(or_connection_t *conn) len = append_address_to_payload(out, &my_addr); if (len < 0) return -1; - out += len; } else { - *out++ = 0; + *out = 0; } connection_or_write_cell_to_buf(&cell, conn); |