aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-23 11:01:39 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-23 11:01:39 -0400
commit9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 (patch)
treee8f51948dfd674724842843d5a23990b5caef0b9 /src/or
parent3fc0f9efb8b0030bab2574e5998a964adc93ebaa (diff)
parentdb72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 (diff)
downloadtor-9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8.tar
tor-9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8.tar.gz
Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
Diffstat (limited to 'src/or')
-rw-r--r--src/or/entrynodes.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 2aa063cda..59770fa65 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
* our entry node list */
entry_guard_register_connect_status(ri->cache_info.identity_digest,
1, 0, now);
- if (first)
+ if (first) {
+ /* XXXX apparently, this is never called. See bug #9229. */
routerlist_retry_directory_downloads(now);
+ }
+
+ update_networkstatus_downloads(now);
}
}
}