diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-06 13:46:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-06 13:46:11 -0500 |
| commit | 176e8a0a2aa25839a8ad9f921971703cdd331eb0 (patch) | |
| tree | 7e269134a89189fa59c0d87cb0067c7efbad3505 /src/or/dirserv.c | |
| parent | 07b8b439c4bee7545a26a61160b2860b18b88185 (diff) | |
| parent | 35fcec38809f9805326d8e2c81bad33d0ef000ae (diff) | |
| download | tor-176e8a0a2aa25839a8ad9f921971703cdd331eb0.tar.gz tor-176e8a0a2aa25839a8ad9f921971703cdd331eb0.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/routerparse.c
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 5d9859f28c..bf61059d2a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2997,6 +2997,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")) { const routerinfo_t *ri = router_get_my_routerinfo(); if (ri) |