Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

This commit is contained in:
Nick Mathewson
2011-03-06 13:42:28 -05:00
4 changed files with 17 additions and 2 deletions
+2
View File
@@ -2970,6 +2970,8 @@ dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
smartlist_add(fps_out,
tor_memdup(r->cache_info.identity_digest, DIGEST_LEN)));
/* Treat "all" requests as if they were unencrypted */
for_unencrypted_conn = 1;
} else if (!strcmp(key, "authority")) {
routerinfo_t *ri = router_get_my_routerinfo();
if (ri)