Commit 7c86f343 authored by Nick Mathewson's avatar Nick Mathewson 🦋
Browse files

Merge branch 'maint-0.4.4' into maint-0.4.5

parents 7fe819c9 48dd8793
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.
...@@ -1320,10 +1320,10 @@ circuit_predict_and_launch_new(void) ...@@ -1320,10 +1320,10 @@ circuit_predict_and_launch_new(void)
if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL)
flags |= CIRCLAUNCH_IS_INTERNAL; flags |= CIRCLAUNCH_IS_INTERNAL;
log_info(LD_CIRC, log_info(LD_CIRC,
"Have %d clean circs need another buildtime test circ.", num); "Have %d clean circs need another buildtime test circ.", num);
circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags); circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags);
return; return;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment