Prechádzať zdrojové kódy

Merge branch 'maint-0.3.3'

Nick Mathewson 6 rokov pred
rodič
commit
c9de30c590
2 zmenil súbory, kde vykonal 7 pridanie a 1 odobranie
  1. 6 0
      changes/bug25691
  2. 1 1
      src/or/circuitbuild.c

+ 6 - 0
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.
+

+ 1 - 1
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;