aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-09 08:29:21 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-09 08:29:21 -0400
commitfa6b80d6e510dd7027cc2dab50622bad4dc90064 (patch)
treee7e67789cb39400a11f9318472d1c8ed9aa72436 /src/or/or.h
parentaacbf551c459e3bccbd7dec53fcefbceaab98a33 (diff)
parentb0bbe6b2f1d8f0f2c83565f94d8a7dc5c5f72a91 (diff)
downloadtor-fa6b80d6e510dd7027cc2dab50622bad4dc90064.tar
tor-fa6b80d6e510dd7027cc2dab50622bad4dc90064.tar.gz
Merge remote-tracking branch 'public/bug10431'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index e17b5816a..19a1c99a9 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1482,6 +1482,10 @@ 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;
+ /** True iff this connection has had its bootstrap failure logged with
+ * control_event_bootstrap_problem. */
+ unsigned int have_noted_bootstrap_problem:1;
+
uint16_t link_proto; /**< What protocol version are we using? 0 for
* "none negotiated yet." */