diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-05-07 10:41:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-05-07 10:41:33 -0400 |
| commit | 48dd87933dd1c592937ef62d20aeac8998edc0fb (patch) | |
| tree | 04f603fa236d33cda7cac6c18db5517fbe433895 | |
| parent | f68aeda5496a217f389c92a28f83828e1170cbf0 (diff) | |
| parent | e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f (diff) | |
| download | tor-48dd87933dd1c592937ef62d20aeac8998edc0fb.tar.gz tor-48dd87933dd1c592937ef62d20aeac8998edc0fb.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.4
| -rw-r--r-- | changes/bug40380 | 3 | ||||
| -rw-r--r-- | src/core/or/circuituse.c | 8 |
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 e2c4df25d0..a88ccf9dd1 100644 --- 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; } } |