tor

commit a7ca08934341deab05d48fa0f074543116a29c38
parent 37ea6cd9eb9bc4b6c0eb4f5d9cf70b97ea43eba4
Author: George Kadianakis <desnacked@riseup.net>
Date:   Wed, 27 Jan 2021 15:39:29 +0200

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

Diffstat:
A
changes/bug40207
 | 
4
++++
M
src/feature/hs/hs_circuit.c
 | 
2
+-
M
src/feature/hs/hs_client.c
 | 
2
+-

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/bug40207 b/changes/bug40207
@@ -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.
diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
@@ -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
    * do, this function will fail to populate the introduce data. */
   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.");
     goto close;
   }
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
@@ -1131,7 +1131,7 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ)
   rend_circ =
   hs_circuitmap_get_established_rend_circ_client_side(rendezvous_cookie);
   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;
   }