aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-18 12:25:08 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-18 12:25:08 -0500
commita8580a683696eb76f5f24fe36e7ea61f9c49db0a (patch)
tree8fe8e072f65e9db0422450da5cd9485e316ef1ab /src/feature
parentf0408b844ffe2545c33306cb04b03fff8148989f (diff)
parent761f1bf71e301f0b68718854379dd42e06fcd202 (diff)
downloadtor-a8580a683696eb76f5f24fe36e7ea61f9c49db0a.tar.gz
tor-a8580a683696eb76f5f24fe36e7ea61f9c49db0a.zip
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/rend/rendmid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index 151604adad..fcfa5052cb 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -230,9 +230,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
(unsigned)circ->p_circ_id);
if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
- log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+ log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+ "Tried to establish rendezvous on non-OR circuit with purpose %s",
+ circuit_purpose_to_string(circ->base_.purpose));
goto err;
}