Merge branch 'maint-0.3.5' into maint-0.4.4

changes/bug40380

+  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.

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;
   }
 }