diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-02 16:31:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-02 16:31:32 -0500 |
| commit | d03e1da232ada2e0d3a3de3dbf6885caec74e4e0 (patch) | |
| tree | cd3fc872abd2f7fa80af365887a0ea87564199b8 /src/or/onion_tap.h | |
| parent | 3b96bf68315083f83a5f807ccf6f41feafeeb445 (diff) | |
| parent | 41ba4f5627326e1745f0eea143f038677170c596 (diff) | |
| download | tor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.tar.gz tor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.zip | |
Merge remote-tracking branch 'public/bug9635_warnings_025'
Conflicts:
src/test/test.c
Diffstat (limited to 'src/or/onion_tap.h')
| -rw-r--r-- | src/or/onion_tap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/onion_tap.h b/src/or/onion_tap.h index f02a4f6f51..c548b3d99f 100644 --- a/src/or/onion_tap.h +++ b/src/or/onion_tap.h @@ -31,7 +31,8 @@ int onion_skin_TAP_server_handshake(const char *onion_skin, int onion_skin_TAP_client_handshake(crypto_dh_t *handshake_state, const char *handshake_reply, char *key_out, - size_t key_out_len); + size_t key_out_len, + const char **msg_out); #endif |