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/main.c | |
| 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/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index 4fc1498a98..48cf7aa144 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2221,8 +2221,8 @@ ip_address_changed(int at_interface) { const or_options_t *options = get_options(); int server = server_mode(options); - int exit_reject_private = (server && options->ExitRelay - && options->ExitPolicyRejectPrivate); + int exit_reject_interfaces = (server && options->ExitRelay + && options->ExitPolicyRejectLocalInterfaces); if (at_interface) { if (! server) { @@ -2240,8 +2240,8 @@ ip_address_changed(int at_interface) } /* Exit relays incorporate interface addresses in their exit policies when - * ExitPolicyRejectPrivate is set */ - if (exit_reject_private || (server && !at_interface)) { + * ExitPolicyRejectLocalInterfaces is set */ + if (exit_reject_interfaces || (server && !at_interface)) { mark_my_descriptor_dirty("IP address changed"); } |