nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1989' into maint-0.4.4

Browse Source
This commit is contained in:
George Kadianakis 2020-07-09 17:08:07 +03:00
commit e500ea2eae
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket34087 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfix (onion service v3 client):
- Remove a BUG() warning that can occur naturally. Fixes bug 34087; bugfix
on 0.3.2.1-alpha.

6
src/feature/hs/hs_client.c
View File

@ -1065,8 +1065,10 @@ close_or_reextend_intro_circ(origin_circuit_t *intro_circ)
tor_assert(intro_circ); tor_assert(intro_circ);
desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk); desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk);
if (BUG(desc == NULL)) { if (desc == NULL) {
/* We can't continue without a descriptor. */ /* We can't continue without a descriptor. This is possible if the cache
* was cleaned up between the intro point established and the reception of
* the introduce ack. */
goto close; goto close;
} }
/* We still have the descriptor, great! Let's try to see if we can /* We still have the descriptor, great! Let's try to see if we can