From: Roger Dingledine <arma@torproject.org>
Date: Sun, 2 Oct 2016 05:12:27 +0000 (-0400)
Subject: Bridges and relays now use microdescriptors
X-Git-Tag: tor-0.3.0.1-alpha~234^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=782b6ec288a553f66e47157d377ec4b200b54394;p=thirdparty%2Ftor.git

Bridges and relays now use microdescriptors

(like clients do) rather than old-style router descriptors. Now bridges
will blend in with clients in terms of the circuits they build.

Fixes bug 6769; bugfix on 0.2.3.2-alpha.
---

diff --git a/changes/bug6769 b/changes/bug6769
new file mode 100644
index 0000000000..83e3aa8b9e
--- /dev/null
+++ b/changes/bug6769
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Bridges and relays now use microdescriptors (like clients do)
+      rather than old-style router descriptors. Now bridges will blend in
+      with clients in terms of the circuits they build. Fixes bug 6769;
+      bugfix on 0.2.3.2-alpha.
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 57efc725a0..ccb28a914d 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -919,12 +919,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: */
-    /* We'll use microdescriptors iff we are
-     * not a server, and we're not autofetching everything. */
-    /* XXXX++ what does not being a server have to do with it? also there's
-     * a partitioning issue here where bridges differ from clients. */
-    ret = !server_mode(options) && !options->FetchUselessDescriptors;
+    /* UseMicrodescriptors is "auto"; choose yes. */
+    return 1;
   }
   return ret;
 }