aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-21 10:32:39 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-21 10:32:39 -0400
commit13eb120beaff5e006c0eb9a3fc8563c5df16a328 (patch)
tree264bdcc0a5a4a91ef17efd2e37115554e0ca0467
parentcb3f9bc2d48e8c3f4847643c03e082d394d33168 (diff)
parent2c057c2833ff2ab0779cbd1e5f3747be0a232126 (diff)
downloadtor-13eb120beaff5e006c0eb9a3fc8563c5df16a328.tar.gz
tor-13eb120beaff5e006c0eb9a3fc8563c5df16a328.zip
Merge remote-tracking branch 'special/bug18600'
-rw-r--r--src/or/rendservice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 09b20e34a4..39e5831589 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2717,7 +2717,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit)
circuit->rend_data->rend_pk_digest);
if (!service) {
log_warn(LD_REND, "Unrecognized service ID %s on introduction circuit %u.",
- serviceid, (unsigned)circuit->base_.n_circ_id);
+ safe_str_client(serviceid), (unsigned)circuit->base_.n_circ_id);
reason = END_CIRC_REASON_NOSUCHSERVICE;
goto err;
}