tor

commit ba8d71d9c37dcce213a0386e96731de5ba7d80fa
parent 8e5c75e89657384516f8c777c1b5fee44bcadc5e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  5 Mar 2020 09:10:24 -0500

Merge remote-tracking branch 'tor-github/pr/1774/head'

Diffstat:
A
changes/bug33531
 | 
3
+++
M
src/core/or/circuituse.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/bug33531 b/changes/bug33531
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logs):
+    - Remove surprising empty line in info-level log about circuit build
+      timeout. Fixes bug 33531; bugfix on 0.3.3.1-alpha.
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
@@ -732,7 +732,7 @@ circuit_expire_building(void)
           circuit_build_times_enough_to_compute(get_circuit_build_times())) {
 
         log_info(LD_CIRC,
-                 "Deciding to count the timeout for circuit %"PRIu32"\n",
+                 "Deciding to count the timeout for circuit %"PRIu32,
                  TO_ORIGIN_CIRCUIT(victim)->global_identifier);
 
         /* Circuits are allowed to last longer for measurement.