diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-10 09:33:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-10 09:33:55 -0500 |
| commit | 2a9b279163da4ba0d870dd5e9b7fc1ae9591127c (patch) | |
| tree | 2c023c47574e4a334ce567f97397c79b92b60c80 /src/or | |
| parent | 2367f7e5594c5b0aab51f87b8221e2b0235ed0ed (diff) | |
| parent | 72ed4a41f5716923ce16d168ad421cc26ab2fbea (diff) | |
| download | tor-2a9b279163da4ba0d870dd5e9b7fc1ae9591127c.tar tor-2a9b279163da4ba0d870dd5e9b7fc1ae9591127c.tar.gz | |
Merge remote-tracking branch 'rransom-tor/bug4883'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 17c92ab6a..dff8bc33a 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -278,7 +278,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, /* Copy the rendezvous cookie from rendcirc to introcirc, so that * when introcirc gets an ack, we can change the state of the right * rendezvous circuit. */ - memcpy(rendcirc->rend_data->rend_cookie, introcirc->rend_data->rend_cookie, + memcpy(introcirc->rend_data->rend_cookie, rendcirc->rend_data->rend_cookie, REND_COOKIE_LEN); log_info(LD_REND, "Sending an INTRODUCE1 cell"); |