aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-08-15 10:52:23 -0400
committerNick Mathewson <nickm@torproject.org>2011-08-15 10:52:23 -0400
commit0ddc8de0b60ecbda3e7bf1df3afc4ef28275dc7a (patch)
treef0846020f22f4c1e1c4844f7d220a5b27e8f4ee9 /src/or
parent70216cb096b5b5daea78abe50681ad1537d584a0 (diff)
downloadtor-0ddc8de0b60ecbda3e7bf1df3afc4ef28275dc7a.tar.gz
tor-0ddc8de0b60ecbda3e7bf1df3afc4ef28275dc7a.zip
Oops; _actually_ enable microdesc-by-default for clients
It turns out that it wasn't enough to set the configuration to "auto", since the correct behavior for "auto" had been disabled in microdesc.c. :p (Hasn't been in a release yet, so doesn't need a changes entry.)
Diffstat (limited to 'src/or')
-rw-r--r--src/or/microdesc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 1b0c333dae..627fad58e1 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -698,14 +698,8 @@ we_use_microdescriptors_for_circuits(const or_options_t *options)
int ret = options->UseMicrodescriptors;
if (ret == -1) {
/* UseMicrodescriptors is "auto"; we need to decide: */
-#if 0
/* So we decide that we'll use microdescriptors iff we are not a server */
ret = ! server_mode(options);
-#else
- /* We don't use microdescs for now: not enough caches are running
- * 0.2.3.1-alpha */
- ret = 0;
-#endif
}
return ret;
}