[tor-commits] [tor/release-0.2.2] Demote 'INTRODUCE2 cell is too {old, new}' message to info level

[arma at torproject.org]

commit 8ea6d29fe468dc91d1c7dfc45ad5b4196e89ebdd
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sat Sep 10 21:40:09 2011 -0400

    Demote 'INTRODUCE2 cell is too {old,new}' message to info level
---
 changes/bug2442b     |    8 ++++++++
 src/or/rendservice.c |    4 +++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/changes/bug2442b b/changes/bug2442b
new file mode 100644
index 0000000..02e1636
--- /dev/null
+++ b/changes/bug2442b
@@ -0,0 +1,8 @@
+  * Minor bugfixes:
+
+    - Demote the 'INTRODUCE2 cell is too {old,new}' log message to
+      info level.  There is nothing that a hidden service's operator
+      can do to fix its clients' clocks.  Bugfix on 0.2.1.6-alpha;
+      fixes part of bug 2442.
+
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 5f55537..6ed9650 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1019,7 +1019,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
     v3_shift += 4;
     if ((now - ts) < -1 * REND_REPLAY_TIME_INTERVAL / 2 ||
         (now - ts) > REND_REPLAY_TIME_INTERVAL / 2) {
-      log_warn(LD_REND, "INTRODUCE2 cell is too %s. Discarding.",
+      /* This is far more likely to mean that a client's clock is
+       * skewed than that a replay attack is in progress. */
+      log_info(LD_REND, "INTRODUCE2 cell is too %s. Discarding.",
                (now - ts) < 0 ? "old" : "new");
       return -1;
     }