diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 19:10:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 19:10:08 -0400 |
| commit | 78196c8822ec8dda5df95428dbb4ae96ec4d2b7f (patch) | |
| tree | 8951cb4cbb699b49b80dbf75ce27e3f55f002cc8 /src/or/or.h | |
| parent | dfa41ac0f32729f9d5a731681d826ec3006f6fb5 (diff) | |
| parent | 514f0041d190b9e142cc246e3ec7ac65342547bd (diff) | |
| download | tor-78196c8822ec8dda5df95428dbb4ae96ec4d2b7f.tar.gz tor-78196c8822ec8dda5df95428dbb4ae96ec4d2b7f.zip | |
Merge remote-tracking branch 'teor/bug18456'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index ed799b98ff..af40cf7e81 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3588,7 +3588,13 @@ typedef struct { /** Bitmask; derived from AllowInvalidNodes. */ invalid_router_usage_t AllowInvalid_; config_line_t *ExitPolicy; /**< Lists of exit policy components. */ - int ExitPolicyRejectPrivate; /**< Should we not exit to local addresses? */ + int ExitPolicyRejectPrivate; /**< Should we not exit to reserved private + * addresses, and our own published addresses? + */ + int ExitPolicyRejectLocalInterfaces; /**< Should we not exit to local + * interface addresses? + * Includes OutboundBindAddresses and + * configured ports. */ config_line_t *SocksPolicy; /**< Lists of socks policy components */ config_line_t *DirPolicy; /**< Lists of dir policy components */ /** Addresses to bind for listening for SOCKS connections. */ |