[tor-commits] [tor/master] Make microdesc use off-by-default for now, since there are not enough caches

[nickm at torproject.org]

commit 85ddc76bf1db86b6c4cd09217b7203ab37a661fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 5 15:53:25 2011 -0400

    Make microdesc use off-by-default for now, since there are not enough caches
---
 src/or/microdesc.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 0e8aa83..9db17cc 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -658,8 +658,14 @@ we_use_microdescriptors_for_circuits(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;
 }