tor

commit 0d63b19afaecbba9ba66afb7d3aad0329c670cf9
parent ba2ee8ae3bc202b0a8f70f50be980eb49c7b0323
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 13 Apr 2021 09:41:13 -0400

Merge branch 'maint-0.4.5'

Diffstat:
A
changes/ticket40360
 | 
5
+++++
M
src/feature/client/entrynodes.c
 | 
3
---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/ticket40360 b/changes/ticket40360
@@ -0,0 +1,5 @@
+  o Minor bugfixes (bridge, pluggable transport):
+    - Fix a regression that prevented to configure a Bridge line without a
+      fingerprint (which is a normal use case). Fixes bug 40360; bugfix on
+      0.4.5.4-rc.
+
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
@@ -804,9 +804,6 @@ get_sampled_guard_for_bridge(guard_selection_t *gs,
   entry_guard_t *guard;
   if (BUG(!addrport))
     return NULL; // LCOV_EXCL_LINE
-  if (bridge_has_invalid_transport(bridge)) {
-    return NULL;
-  }
   guard = get_sampled_guard_by_bridge_addr(gs, addrport);
   if (! guard || (id && tor_memneq(id, guard->identity, DIGEST_LEN)))
     return NULL;