summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/all_descs4
-rw-r--r--src/or/dirserv.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/all_descs b/changes/all_descs
new file mode 100644
index 0000000000..10711b2621
--- /dev/null
+++ b/changes/all_descs
@@ -0,0 +1,4 @@
+ o Major bugfixes (bridge authority)
+ - Do not allow encrypte requests for "all" bridges to return all
+ bridges.
+
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)