Merge remote-tracking branch 'tlyu-github/bug28929'

This commit is contained in:
Nick Mathewson 2019-01-07 08:46:27 -05:00
commit 7a7685955e

View File

@ -73,7 +73,7 @@ static const struct {
{ BOOTSTRAP_STATUS_AP_CONN_DONE_PT, "ap_conn_done_pt", { BOOTSTRAP_STATUS_AP_CONN_DONE_PT, "ap_conn_done_pt",
"Connected to pluggable transport to build circuits" }, "Connected to pluggable transport to build circuits" },
{ BOOTSTRAP_STATUS_AP_CONN_PROXY, "ap_conn_proxy", { 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", { BOOTSTRAP_STATUS_AP_CONN_DONE_PROXY, "ap_conn_done_proxy",
"Connected to proxy to build circuits" }, "Connected to proxy to build circuits" },
{ BOOTSTRAP_STATUS_AP_CONN, "ap_conn", { BOOTSTRAP_STATUS_AP_CONN, "ap_conn",