Merge branch 'maint-0.4.5'

This commit is contained in:
Nick Mathewson 2021-04-13 09:41:13 -04:00
commit 0d63b19afa
2 changed files with 5 additions and 3 deletions

5
changes/ticket40360 Normal file
View File

@ -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.

View File

@ -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;