aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug80625
-rw-r--r--src/or/or.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug8062 b/changes/bug8062
new file mode 100644
index 000000000..805e51ed4
--- /dev/null
+++ b/changes/bug8062
@@ -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.
diff --git a/src/or/or.h b/src/or/or.h
index c7d259853..2fe36ba19 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. */