Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

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.
+
+

src/or/routerparse.c

@@ -4639,8 +4639,10 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
     eos = eos + 1;
   /* Check length. */
   if (strlen(desc) > REND_DESC_MAX_SIZE) {
+    /* XXX023 If we are parsing this descriptor as a server, this
+     * should be a protocol warning. */
     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;
   }