diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:36:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-23 07:36:56 -0500 |
| commit | e88686cb2cbae39333982505f38f2d7568af4f32 (patch) | |
| tree | 874f90fe8e155a791d0adec61d52accd3bc073e2 /src/or/directory.c | |
| parent | 48c1c028ca65c9fbdb83f47e5ccda0469b031bdd (diff) | |
| parent | 0ba672a7fdb952c612ee9215bd7e8a6b02f4f8f7 (diff) | |
| download | tor-e88686cb2cbae39333982505f38f2d7568af4f32.tar.gz tor-e88686cb2cbae39333982505f38f2d7568af4f32.zip | |
Merge remote-tracking branch 'teor/bug18348-v2'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 399752a02c..109dbce7eb 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -972,7 +972,7 @@ directory_command_should_use_begindir(const or_options_t *options, return 0; if (indirection == DIRIND_ONEHOP) if (!fascist_firewall_allows_address_addr(addr, or_port, - FIREWALL_OR_CONNECTION, 0) || + FIREWALL_OR_CONNECTION, 0, 0) || directory_fetches_from_authorities(options)) return 0; /* We're firewalled or are acting like a relay -- also no. */ return 1; |