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/entrynodes.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/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 95d9fecfe4..771a0ef377 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2121,9 +2121,9 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) } /* Until we get a descriptor for the bridge, we only know one address for - * it. If we */ + * it. */ if (!fascist_firewall_allows_address_addr(&bridge->addr, bridge->port, - FIREWALL_OR_CONNECTION, 0)) { + FIREWALL_OR_CONNECTION, 0, 0)) { log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a " "bridge, but that bridge is not reachable through our " "firewall."); @@ -2193,7 +2193,8 @@ fetch_bridge_descriptors(const or_options_t *options, time_t now) if (ask_bridge_directly && !fascist_firewall_allows_address_addr(&bridge->addr, bridge->port, - FIREWALL_OR_CONNECTION, 0)) { + FIREWALL_OR_CONNECTION, 0, + 0)) { log_notice(LD_DIR, "Bridge at '%s' isn't reachable by our " "firewall policy. %s.", fmt_addrport(&bridge->addr, bridge->port), |