Forráskód Böngészése

Merge branch 'careful_with_all_descs' into maint-0.2.1

Nick Mathewson 13 éve
szülő
commit
0f637492e3
2 módosított fájl, 6 hozzáadás és 0 törlés
  1. 4 0
      changes/all_descs
  2. 2 0
      src/or/dirserv.c

+ 4 - 0
changes/all_descs

@@ -0,0 +1,4 @@
+  o Major bugfixes (bridge authority)
+    - Do not allow encrypte requests for "all" bridges to return all
+      bridges.
+

+ 2 - 0
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)