mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/247'

Browse source
This commit is contained in:
George Kadianakis 2021-01-27 15:39:29 +02:00
commit a7ca089343
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug40207 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes (onion services, logging):
- Downgrade the severity of a few rendezvous circuit-related
warnings from warning to info. Fixes bug 40207; bugfix on
0.3.2.1-alpha. Patch by Neel Chauhan.

2
src/feature/hs/hs_circuit.c
View file

@ -1181,7 +1181,7 @@ hs_circ_send_introduce1(origin_circuit_t *intro_circ,
/* We should never select an invalid rendezvous point in theory but if we /* We should never select an invalid rendezvous point in theory but if we
* do, this function will fail to populate the introduce data. */ * do, this function will fail to populate the introduce data. */
if (setup_introduce1_data(ip, exit_node, subcredential, &intro1_data) < 0) { if (setup_introduce1_data(ip, exit_node, subcredential, &intro1_data) < 0) {
log_warn(LD_REND, "Unable to setup INTRODUCE1 data. The chosen rendezvous " log_info(LD_REND, "Unable to setup INTRODUCE1 data. The chosen rendezvous "
"point is unusable. Closing circuit."); "point is unusable. Closing circuit.");
goto close; goto close;
} }

2
src/feature/hs/hs_client.c
View file

@ -1131,7 +1131,7 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ)
rend_circ = rend_circ =
hs_circuitmap_get_established_rend_circ_client_side(rendezvous_cookie); hs_circuitmap_get_established_rend_circ_client_side(rendezvous_cookie);
if (rend_circ == NULL) { if (rend_circ == NULL) {
log_warn(LD_REND, "Can't find any rendezvous circuit. Stopping"); log_info(LD_REND, "Can't find any rendezvous circuit. Stopping");
goto end; goto end;
} }