[tor-commits] [tor/release-0.2.2] Correct the warning emitted when rejecting an oversized HS desc

[arma at torproject.org]

commit bfebc942eaf7098e8d35f1de9159da450d5e3969
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Mon Apr 11 02:26:07 2011 -0700

    Correct the warning emitted when rejecting an oversized HS desc
---
 changes/bug2750      |    6 ++++++
 src/or/routerparse.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/changes/bug2750 b/changes/bug2750
new file mode 100644
index 0000000..4371a0a
--- /dev/null
+++ b/changes/bug2750
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Correct the warning displayed when a rendezvous descriptor exceeds
+      the maximum size.  Fixes bug 2750; bugfix on 0.2.1.5-alpha.  Found
+      by John Brooks.
+
+
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1faa177..28ecaf0 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3629,7 +3629,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
   /* Check length. */
   if (strlen(desc) > REND_DESC_MAX_SIZE) {
     log_warn(LD_REND, "Descriptor length is %i which exceeds "
-             "maximum rendezvous descriptor size of %i kilobytes.",
+             "maximum rendezvous descriptor size of %i bytes.",
              (int)strlen(desc), REND_DESC_MAX_SIZE);
     goto err;
   }