summaryrefslogtreecommitdiff
path: root/src/or/bridges.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-14 08:47:11 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-14 08:47:11 -0400
commit63af663b8c83d771ed8fd29802e9a4c5cb074c70 (patch)
tree9d60aaaed98fda1e33217cb7e368353461976a61 /src/or/bridges.c
parent3de63fe4b13dec4b8bc876e1e402dc0bf3e93fff (diff)
downloadtor-63af663b8c83d771ed8fd29802e9a4c5cb074c70.tar.gz
tor-63af663b8c83d771ed8fd29802e9a4c5cb074c70.zip
Remove a download_status_reset() call that led to a crash -- see 23347
Diffstat (limited to 'src/or/bridges.c')
-rw-r--r--src/or/bridges.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/bridges.c b/src/or/bridges.c
index 461f86260f..0d4549dd16 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -455,8 +455,8 @@ bridge_add_from_config(bridge_line_t *bridge_line)
b->fetch_status.schedule = DL_SCHED_BRIDGE;
b->fetch_status.backoff = DL_SCHED_RANDOM_EXPONENTIAL;
b->fetch_status.increment_on = DL_SCHED_INCREMENT_ATTEMPT;
- /* This will fail if UseBridges is not set */
- download_status_reset(&b->fetch_status);
+ /* This will fail if UseBridges is not set -- and it does. */
+ // download_status_reset(&b->fetch_status);
b->socks_args = bridge_line->socks_args;
if (!bridge_list)
bridge_list = smartlist_new();