nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4

Browse Source
This commit is contained in:
Nick Mathewson 2020-08-11 12:40:02 -04:00
commit d76f8457f3
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug34086 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (onion service v3):
- Remove a BUG() warning that could trigger in certain unlikely edge-cases.
Fixes bug 34086; bugfix on 0.3.2.1-alpha.

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

@ -778,10 +778,16 @@ client_rendezvous_circ_has_opened(origin_circuit_t *circ)
* the v3 rendezvous protocol */
if (rp_ei) {
const node_t *rp_node = node_get_by_id(rp_ei->identity_digest);
if (rp_node) {
if (BUG(!node_supports_v3_rendezvous_point(rp_node))) {
return;
}
if (rp_node && !node_supports_v3_rendezvous_point(rp_node)) {
/* Even tho we checked that this node supported v3 when we created the
rendezvous circuit, there is a chance that we might think it does
not support v3 anymore. This might happen if we got a new consensus
in the meanwhile, where the relay is still listed but its listed
descriptor digest has changed and hence we can't access its 'ri' or
'md'. */
log_info(LD_REND, "Rendezvous node %s did not support v3 after circuit "
"has opened.", safe_str_client(extend_info_describe(rp_ei)));
return;
}
}