diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:31:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:31:57 -0400 |
| commit | 34e4122025791d1a607426e5e543d6312872b9dd (patch) | |
| tree | 975c1dc949d81ed7a76f50726a49d4aa8e67533e /src/or/rendcommon.c | |
| parent | 649104fdb950057288a5e7b48f402d563546b83b (diff) | |
| parent | 2f17743d6f7222cf96250890dd91d6689b2d55c6 (diff) | |
| download | tor-34e4122025791d1a607426e5e543d6312872b9dd.tar.gz tor-34e4122025791d1a607426e5e543d6312872b9dd.zip | |
Merge branch 'ticket20657_nickm_bugfixes_squashed'
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 986bfde75f..8b555a3164 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -777,7 +777,7 @@ rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, break; case RELAY_COMMAND_INTRODUCE2: if (origin_circ) - r = rend_service_receive_introduction(origin_circ,payload,length); + r = hs_service_receive_introduce2(origin_circ,payload,length); break; case RELAY_COMMAND_INTRODUCE_ACK: if (origin_circ) @@ -793,7 +793,7 @@ rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, break; case RELAY_COMMAND_INTRO_ESTABLISHED: if (origin_circ) - r = rend_service_intro_established(origin_circ,payload,length); + r = hs_service_receive_intro_established(origin_circ,payload,length); break; case RELAY_COMMAND_RENDEZVOUS_ESTABLISHED: if (origin_circ) |