Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2

1 files changed, 4 insertions, 9 deletions

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 683e11ad24..3b18bf6078 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -984,15 +984,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. */