diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-24 10:45:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-24 10:45:11 -0400 |
| commit | 51329054199e2b7eb3aed46282028f04e13a13ad (patch) | |
| tree | 71ec92073fc80e7d838fe589bc308759f6ad9f3e /src/or/or.h | |
| parent | 297635f806ec4244c4e6e6f093f87d647061d42a (diff) | |
| parent | 5280a700aae934753671d26e75050177b510d30d (diff) | |
| download | tor-51329054199e2b7eb3aed46282028f04e13a13ad.tar.gz tor-51329054199e2b7eb3aed46282028f04e13a13ad.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 1bac43c20a..43b31c0fdd 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5226,7 +5226,10 @@ typedef enum { CRN_WEIGHT_AS_EXIT = 1<<5, CRN_NEED_DESC = 1<<6, /* On clients, only provide nodes that satisfy ClientPreferIPv6OR */ - CRN_PREF_ADDR = 1<<7 + CRN_PREF_ADDR = 1<<7, + /* On clients, only provide nodes that we can connect to directly, based on + * our firewall rules */ + CRN_DIRECT_CONN = 1<<8 } router_crn_flags_t; /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */ |