diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
| commit | 5a3d9636f5e0ead80a46163af9ffadcbf6d5195f (patch) | |
| tree | 3f9a94eba2b969a313aa9ea01dd40f9b0eed9fca /src/or/relay.c | |
| parent | 62a77f1117335f2ddee86f696379dde106ad1ee0 (diff) | |
| parent | ba9a12119c88676fa0dd2a282d927840cd5d94fb (diff) | |
| download | tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.tar.gz tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.zip | |
Merge remote-tracking branch 'public/bug3940_redux'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index e22ce47b21..0c99c3497b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -764,7 +764,7 @@ connection_ap_process_end_not_open( /* rewrite it to an IP if we learned one. */ if (addressmap_rewrite(conn->socks_request->address, sizeof(conn->socks_request->address), - NULL)) { + NULL, NULL)) { control_event_stream_status(conn, STREAM_EVENT_REMAP, 0); } if (conn->chosen_exit_optional || |