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.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.h')
| -rw-r--r-- | src/or/onion.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/onion.h b/src/or/onion.h index 96050083f8..45454f480d 100644 --- a/src/or/onion.h +++ b/src/or/onion.h @@ -49,7 +49,8 @@ int onion_skin_client_handshake(int type, const onion_handshake_state_t *handshake_state, const uint8_t *reply, size_t reply_len, uint8_t *keys_out, size_t key_out_len, - uint8_t *rend_authenticator_out); + uint8_t *rend_authenticator_out, + const char **msg_out); /** A parsed CREATE, CREATE_FAST, or CREATE2 cell. */ typedef struct create_cell_t { |