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 | 6dc3423e3ebd7ab10647b54b87584764349f4a50 (patch) | |
tree | 83820ffce6aec237f63d86ae8f048a53bb3f13fe | |
parent | d6816de3e09bf35c2b3150f42dc9dbc82651b6fc (diff) | |
parent | e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f (diff) | |
download | tor-6dc3423e3ebd7ab10647b54b87584764349f4a50.tar.gz tor-6dc3423e3ebd7ab10647b54b87584764349f4a50.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-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 7273be3510..efd69fb4a3 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1315,10 +1315,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; } } |