diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-03 13:24:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-03 13:24:46 -0400 |
| commit | c1005dd6d34a40080af478ef4cb85860d04f3844 (patch) | |
| tree | 92a0a04d2a328ee025cac1560097b584d1089a68 /src/or/circuitbuild.c | |
| parent | d029c3223ad0d72b8e065c0e92df734185987acf (diff) | |
| parent | 972564630e8f85499e611f1eeb7174d0c0230731 (diff) | |
| download | tor-c1005dd6d34a40080af478ef4cb85860d04f3844.tar.gz tor-c1005dd6d34a40080af478ef4cb85860d04f3844.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c4b697c9a6..b04bd10120 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4997,7 +4997,6 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) DIR_PURPOSE_FETCH_SERVERDESC)) return; /* it's already on the way */ - address = tor_dup_addr(&bridge->addr); if (routerset_contains_bridge(options->ExcludeNodes, bridge)) { download_status_mark_impossible(&bridge->fetch_status); log_warn(LD_APP, "Not using bridge at %s: it is in ExcludeNodes.", @@ -5005,6 +5004,8 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + address = tor_dup_addr(&bridge->addr); + directory_initiate_command(address, &bridge->addr, bridge->port, 0, 0, /* does not matter */ |