summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug256916
-rw-r--r--src/or/circuitbuild.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug25691 b/changes/bug25691
new file mode 100644
index 0000000000..5f630d5032
--- /dev/null
+++ 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
index 01921bac15..5f1f8122fd 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2860,7 +2860,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;