summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-05-07 10:41:34 -0400
committerNick Mathewson <nickm@torproject.org>2021-05-07 10:41:34 -0400
commit7c86f34340acf7d8cf35501e71b03f2feba1245e (patch)
treed94caf42e32f4d0037ea87c059abbdd2ae9729a1
parent7fe819c9510bc0b738c55abf7339b64498265c05 (diff)
parent48dd87933dd1c592937ef62d20aeac8998edc0fb (diff)
downloadtor-7c86f34340acf7d8cf35501e71b03f2feba1245e.tar.gz
tor-7c86f34340acf7d8cf35501e71b03f2feba1245e.zip
Merge branch 'maint-0.4.4' into maint-0.4.5
-rw-r--r--changes/bug403803
-rw-r--r--src/core/or/circuituse.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/changes/bug40380 b/changes/bug40380
new file mode 100644
index 0000000000..24d2876b7d
--- /dev/null
+++ 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
index 0f3fc29361..059e43ec47 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -1320,10 +1320,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;
}
}