nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-18 16:34:29 -04:00
commit b0f7af1615
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug8062 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Increase the width of the field used to remember a connection's
link protocol version to two bytes. Harmless for now, since the
only currently recognized versions are one byte long. Reported
pseudynmously. Fixes bug 8062, bugfix on 0.2.0.10-alpha.

2
src/or/or.h
View File

@ -1417,7 +1417,7 @@ typedef struct or_connection_t {
unsigned int is_outgoing:1; unsigned int is_outgoing:1;
unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */
unsigned int wide_circ_ids:1; unsigned int wide_circ_ids:1;
uint8_t link_proto; /**< What protocol version are we using? 0 for uint16_t link_proto; /**< What protocol version are we using? 0 for
* "none negotiated yet." */ * "none negotiated yet." */
or_handshake_state_t *handshake_state; /**< If we are setting this connection or_handshake_state_t *handshake_state; /**< If we are setting this connection