commit 2c057c2833ff2ab0779cbd1e5f3747be0a232126 Author: John Brooks special@torproject.org Date: Mon Mar 21 19:22:14 2016 +0700

Scrub service name in introduction circuit warning

Fixes bug 18600. --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 09b20e3..39e5831 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; }