tor

commit c9de30c590b7e47a6263b0e4d6b324c237b99330
parent 61d87dfa1509aaf209ff72d7c5e091d06b191040
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 13 Apr 2018 13:05:53 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug25691
 | 
6
++++++
M
src/or/circuitbuild.c
 | 
2
+-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug25691 b/changes/bug25691
@@ -0,0 +1,6 @@
+  o Minor bugfixes (client):
+    - When using a listed relay as a bridge, and also using
+      microdescriptors, and considering that relay as a non-bridge in
+      a circuit, consider its microdescriptor as a valid source of information
+      about that relay. Fixes bug 25691; bugfix on 0.3.3.4-alpha.
+
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
@@ -2791,7 +2791,7 @@ extend_info_from_node(const node_t *node, int for_direct_connect)
   const int is_bridge = node_is_a_configured_bridge(node);
   const int we_use_mds = we_use_microdescriptors_for_circuits(get_options());
 
-  if (is_bridge || !we_use_mds) {
+  if ((is_bridge && for_direct_connect) || !we_use_mds) {
     /* We need an ri in this case. */
     if (!node->ri)
       return NULL;