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

changes/bug2748

@@ -0,0 +1,10 @@
+  o Minor bugfixes
+    - Remove dead code from rend_cache_lookup_v2_desc_as_dir.  Fixes
+      part of bug 2748; bugfix on 0.2.0.10-alpha.
+    - Log malformed requests for rendezvous descriptors as protocol
+      warnings, not warnings.  Also, use a more informative log
+      message in case someone sees it at log level warning without
+      prior info-level messages.  Fixes the other part of bug 2748;
+      bugfix on 0.2.0.10-alpha.
+
+

src/or/rendcommon.c

@@ -983,15 +983,10 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc)
   tor_assert(rend_cache_v2_dir);
   if (base32_decode(desc_id_digest, DIGEST_LEN,
                     desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) {
-    log_warn(LD_REND, "Descriptor ID contains illegal characters: %s",
-             safe_str(desc_id));
-    return -1;
-  }
-  /* Determine if we are responsible. */
-  if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) {
-    log_info(LD_REND, "Could not answer fetch request for v2 descriptor; "
-                      "either we are no hidden service directory, or we are "
-                      "not responsible for the requested ID.");
+    log_fn(LOG_PROTOCOL_WARN, LD_REND,
+           "Rejecting v2 rendezvous descriptor request -- descriptor ID "
+           "contains illegal characters: %s",
+           safe_str(desc_id));
     return -1;
   }
   /* Lookup descriptor and return. */