tor

commit 48dd87933dd1c592937ef62d20aeac8998edc0fb
parent f68aeda5496a217f389c92a28f83828e1170cbf0
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  7 May 2021 10:41:33 -0400

Merge branch 'maint-0.3.5' into maint-0.4.4

Diffstat:
A
changes/bug40380
 | 
3
+++
M
src/core/or/circuituse.c
 | 
8
++++----

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/changes/bug40380 b/changes/bug40380
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+    - Fix an indentation problem that led to a warning from  GCC 11.1.1.
+      Fixes bug 40380; bugfix on 0.3.0.1-alpha.
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
@@ -1316,10 +1316,10 @@ circuit_predict_and_launch_new(void)
     if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL)
       flags |= CIRCLAUNCH_IS_INTERNAL;
 
-      log_info(LD_CIRC,
-               "Have %d clean circs need another buildtime test circ.", num);
-      circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags);
-      return;
+    log_info(LD_CIRC,
+             "Have %d clean circs need another buildtime test circ.", num);
+    circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags);
+    return;
   }
 }