summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-06 13:42:28 -0500
committerNick Mathewson <nickm@torproject.org>2011-03-06 13:42:28 -0500
commit35fcec38809f9805326d8e2c81bad33d0ef000ae (patch)
treec84d4b3c3a4388b1fe715d5a43e586f15a1e14d1 /src/or/dirserv.c
parented14888e7e9ffb1877ddb7780b5033314d244fb3 (diff)
parent4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9 (diff)
downloadtor-35fcec38809f9805326d8e2c81bad33d0ef000ae.tar.gz
tor-35fcec38809f9805326d8e2c81bad33d0ef000ae.zip
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 876698a2dc..3c15c59dc4 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -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)