diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-04-13 09:40:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-04-13 09:40:02 -0400 |
| commit | 1aa8fd66be0c1db3339b6b1fd6653981da9fbd75 (patch) | |
| tree | 11cb0799eac746dea8c374d28af0462a9673005f | |
| parent | 41ad333c2f888914787185557b2df5864c0938e2 (diff) | |
| parent | 218f9f90fb58ee521296fdc3b00189c70e4e4297 (diff) | |
| download | tor-1aa8fd66be0c1db3339b6b1fd6653981da9fbd75.tar.gz tor-1aa8fd66be0c1db3339b6b1fd6653981da9fbd75.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
| -rw-r--r-- | changes/ticket40360 | 5 | ||||
| -rw-r--r-- | src/feature/client/entrynodes.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changes/ticket40360 b/changes/ticket40360 new file mode 100644 index 0000000000..4a1b2c3446 --- /dev/null +++ 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 index 232216c521..82866ea668 100644 --- 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; |