Merge branch 'maint-0.3.3' into release-0.3.3
This commit is contained in:
commit
50406c2720
|
@ -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.
|
||||||
|
|
|
@ -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 is_bridge = node_is_a_configured_bridge(node);
|
||||||
const int we_use_mds = we_use_microdescriptors_for_circuits(get_options());
|
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. */
|
/* We need an ri in this case. */
|
||||||
if (!node->ri)
|
if (!node->ri)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue