commit 63af663b8c83d771ed8fd29802e9a4c5cb074c70 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 08:47:11 2017 -0400

Remove a download_status_reset() call that led to a crash -- see 23347 --- src/or/bridges.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/bridges.c b/src/or/bridges.c index 461f86260..0d4549dd1 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();