tor

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
parent b5fdb91adaad7fd863856ad505665908bd24ea15
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 18 Jan 2019 12:25:08 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

Diffstat:
A
changes/bug29029
 | 
5
+++++
M
src/or/rendmid.c
 | 
6
+++---

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/changes/bug29029 b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+    - Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+      a warning. Instead, log it as a protocol warning, because there is
+      nothing that relay operators can do to fix it. Fixes bug 29029;
+      bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
@@ -227,9 +227,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;
   }