aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-03 09:38:54 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-03 09:38:54 -0400
commit3781955f079f25f8d6aa47cb746e339497076050 (patch)
tree65520db29b77f5f0af7b6df9ffccec44c4c63013 /src/or/or.h
parent9063f29160615b379f907009e7158f1fcf1ed84c (diff)
parent01e4bc80cd75bbf2a4ce3b18ff17550eed993bb0 (diff)
downloadtor-3781955f079f25f8d6aa47cb746e339497076050.tar.gz
tor-3781955f079f25f8d6aa47cb746e339497076050.zip
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 1609587717..adf3cfa866 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3186,6 +3186,9 @@ typedef struct or_circuit_t {
* to the specification? */
unsigned int remaining_relay_early_cells : 4;
+ /* We have already received an INTRODUCE1 cell on this circuit. */
+ unsigned int already_received_introduce1 : 1;
+
/** True iff this circuit was made with a CREATE_FAST cell. */
unsigned int is_first_hop : 1;