[tor-commits] [tor/master] Bridges and relays now use microdescriptors

[nickm at torproject.org]

commit 782b6ec288a553f66e47157d377ec4b200b54394
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Oct 2 01:12:27 2016 -0400

    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.
---
 changes/bug6769    | 5 +++++
 src/or/microdesc.c | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/bug6769 b/changes/bug6769
new file mode 100644
index 0000000..83e3aa8
--- /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 57efc72..ccb28a9 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;
 }