summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-07 08:46:27 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-07 08:46:27 -0500
commit7a7685955ec9ba464aee0ad67523219c3ad70f84 (patch)
tree9160a2b68baced55b13339cab0120dcd32a94712 /src
parentfe26e1f1c83b641827da7794beb4faf23fad6e97 (diff)
parent7e753117146266fa39841b4cc9fa63febfe9e92a (diff)
downloadtor-7a7685955ec9ba464aee0ad67523219c3ad70f84.tar.gz
tor-7a7685955ec9ba464aee0ad67523219c3ad70f84.zip
Merge remote-tracking branch 'tlyu-github/bug28929'
Diffstat (limited to 'src')
-rw-r--r--src/feature/control/control_bootstrap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/control/control_bootstrap.c b/src/feature/control/control_bootstrap.c
index 49e190dc51..d7a0438513 100644
--- a/src/feature/control/control_bootstrap.c
+++ b/src/feature/control/control_bootstrap.c
@@ -73,7 +73,7 @@ static const struct {
{ BOOTSTRAP_STATUS_AP_CONN_DONE_PT, "ap_conn_done_pt",
"Connected to pluggable transport to build circuits" },
{ BOOTSTRAP_STATUS_AP_CONN_PROXY, "ap_conn_proxy",
- "Connecting to proxy " },
+ "Connecting to proxy to build circuits" },
{ BOOTSTRAP_STATUS_AP_CONN_DONE_PROXY, "ap_conn_done_proxy",
"Connected to proxy to build circuits" },
{ BOOTSTRAP_STATUS_AP_CONN, "ap_conn",