summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-05 09:10:24 -0500
committerNick Mathewson <nickm@torproject.org>2020-03-05 09:10:24 -0500
commitba8d71d9c37dcce213a0386e96731de5ba7d80fa (patch)
tree9edf39755ecb3e69d9dea755f885984125064160
parent8e5c75e89657384516f8c777c1b5fee44bcadc5e (diff)
parent29542ccdcc553184dcf41aa703ce2d08c5ea9e52 (diff)
downloadtor-ba8d71d9c37dcce213a0386e96731de5ba7d80fa.tar.gz
tor-ba8d71d9c37dcce213a0386e96731de5ba7d80fa.zip
Merge remote-tracking branch 'tor-github/pr/1774/head'
-rw-r--r--changes/bug335313
-rw-r--r--src/core/or/circuituse.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug33531 b/changes/bug33531
new file mode 100644
index 0000000000..c4284c55c9
--- /dev/null
+++ 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
index 5d10cacc71..066d5d437a 100644
--- 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.