aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-06 13:35:42 -0500
committerNick Mathewson <nickm@torproject.org>2011-03-06 13:35:42 -0500
commit0f637492e30e19ad7abeedafdd58c087f01b4527 (patch)
tree4a018ee715bd047d5a44adeb9a8481148b5a0ad0 /src/or
parent8b01fd7badc893b849d4394a2b72d422eecf7913 (diff)
parentb231026c42ea5cd884b4bde25cde3ba2c6e5ca98 (diff)
downloadtor-0f637492e30e19ad7abeedafdd58c087f01b4527.tar.gz
tor-0f637492e30e19ad7abeedafdd58c087f01b4527.zip
Merge branch 'careful_with_all_descs' into maint-0.2.1
Diffstat (limited to 'src/or')
-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 1649bd7408..7db6c19a33 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2699,6 +2699,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)