diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-03 11:53:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-03 11:53:01 -0500 |
| commit | cc7de9ce1d0532d97623a74ed014e39c62a6a840 (patch) | |
| tree | 788a578a7c58584977f2c8f1e1b5e7090e63069b /src/or/bridges.c | |
| parent | aec505a310601149d7ad3e8ae61b4f988ed8e8ed (diff) | |
| parent | 30225fd89a1899cad4f53506773939ca64ead8b0 (diff) | |
| download | tor-cc7de9ce1d0532d97623a74ed014e39c62a6a840.tar.gz tor-cc7de9ce1d0532d97623a74ed014e39c62a6a840.zip | |
Merge branch 'ticket23814' into maint-0.3.3
Diffstat (limited to 'src/or/bridges.c')
| -rw-r--r-- | src/or/bridges.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/bridges.c b/src/or/bridges.c index d88d6c6434..29d00f37ba 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -458,7 +458,6 @@ bridge_add_from_config(bridge_line_t *bridge_line) if (bridge_line->transport_name) b->transport_name = bridge_line->transport_name; b->fetch_status.schedule = DL_SCHED_BRIDGE; - b->fetch_status.backoff = DL_SCHED_RANDOM_EXPONENTIAL; b->fetch_status.increment_on = DL_SCHED_INCREMENT_ATTEMPT; /* We can't reset the bridge's download status here, because UseBridges * might be 0 now, and it might be changed to 1 much later. */ @@ -637,8 +636,7 @@ fetch_bridge_descriptors(const or_options_t *options, time_t now) SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { /* This resets the download status on first use */ - if (!download_status_is_ready(&bridge->fetch_status, now, - IMPOSSIBLE_TO_DOWNLOAD)) + if (!download_status_is_ready(&bridge->fetch_status, now)) continue; /* don't bother, no need to retry yet */ if (routerset_contains_bridge(options->ExcludeNodes, bridge)) { download_status_mark_impossible(&bridge->fetch_status); |