diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:34:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:34:29 -0400 |
| commit | b0f7af16156ef7d0c401485c6e7a533857f7b316 (patch) | |
| tree | 6c4293a1cc6bc38e6bcf0c5e7a0e427c889c02cf /src | |
| parent | 899c2805b158e0e82ad6979a49b549793364c0d5 (diff) | |
| parent | 01407f9718a7b1eb4e43b46c2799a390551aad29 (diff) | |
| download | tor-b0f7af16156ef7d0c401485c6e7a533857f7b316.tar.gz tor-b0f7af16156ef7d0c401485c6e7a533857f7b316.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
| -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 fcdb34eabe..a341109d4d 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. */ |