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/onion.c | |
| parent | 30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff) | |
| parent | 989db9aed19f0ca3c93a1638bab4a2b473a94aa9 (diff) | |
| download | tor-66039d98430bfbbc921f386b41366b78579e07f0.tar tor-66039d98430bfbbc921f386b41366b78579e07f0.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/routerparse.c
Diffstat (limited to 'src/or/onion.c')
| -rw-r--r-- | src/or/onion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index b8f3019e1..9db9145c7 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -392,8 +392,8 @@ fast_server_handshake(const uint8_t *key_in, /* DIGEST_LEN bytes */ * and protected by TLS). */ int -fast_client_handshake(const uint8_t *handshake_state, /* DIGEST_LEN bytes */ - const uint8_t *handshake_reply_out, /* DIGEST_LEN*2 bytes */ +fast_client_handshake(const uint8_t *handshake_state,/*DIGEST_LEN bytes*/ + const uint8_t *handshake_reply_out,/*DIGEST_LEN*2 bytes*/ uint8_t *key_out, size_t key_out_len) { |