diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:33:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:33:47 -0400 |
| commit | 01407f9718a7b1eb4e43b46c2799a390551aad29 (patch) | |
| tree | 1d283e39f54efce05bd3e8b5900de24df1f0d3a8 /src/or | |
| parent | dbdc99483df6f0fdba9f7af8954719d47990a8b8 (diff) | |
| parent | fca578d9b56d7d80fc43f21b77153d7e5cad92d6 (diff) | |
| download | tor-01407f9718a7b1eb4e43b46c2799a390551aad29.tar tor-01407f9718a7b1eb4e43b46c2799a390551aad29.tar.gz | |
Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index fcdb34eab..a341109d4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1417,8 +1417,8 @@ typedef struct or_connection_t { unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; - uint8_t link_proto; /**< What protocol version are we using? 0 for - * "none negotiated yet." */ + uint16_t link_proto; /**< What protocol version are we using? 0 for + * "none negotiated yet." */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */ |