diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
| commit | 12cf73c4516132a85f76d1c6e60c9492e8751987 (patch) | |
| tree | 11254e166ba6134597416fa2a8d91c3178212853 /src/or/or.h | |
| parent | ec4142abdf7fa4efaa281413e31acc93bf22ea4a (diff) | |
| parent | 1c6f8841f47d5d55e73d18a9414fc68377a13c0e (diff) | |
| download | tor-12cf73c4516132a85f76d1c6e60c9492e8751987.tar.gz tor-12cf73c4516132a85f76d1c6e60c9492e8751987.zip | |
Merge remote-tracking branch 'andrea/ticket19858_v2'
Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 66717792b4..d0570a9249 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2365,9 +2365,6 @@ typedef struct node_t { /** Local info: we treat this node as if it rejects everything */ unsigned int rejects_all:1; - /** Local info: this node is in our list of guards */ - unsigned int using_as_guard:1; - /* Local info: derived. */ /** True if the IPv6 OR port is preferred over the IPv4 OR port. |