From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Apr 2015 13:26:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.6.7~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047555214056da24d682d47562a88e53563e49ff;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
---

047555214056da24d682d47562a88e53563e49ff
diff --cc src/or/rendcommon.c
index 866f4fb026,bd701b217e..5fdd13efce
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@@ -1183,14 -1086,8 +1183,14 @@@ rend_cache_store_v2_desc_as_client(cons
               service_id, safe_str(rend_query->onion_address));
      goto err;
    }
 +  if (tor_memneq(desc_id, want_desc_id, DIGEST_LEN)) {
 +    log_warn(LD_REND, "Received service descriptor for %s with incorrect "
 +             "descriptor ID.", service_id);
 +    goto err;
 +  }
 +
    /* Decode/decrypt introduction points. */
-   if (intro_content) {
+   if (intro_content && intro_size > 0) {
      int n_intro_points;
      if (rend_query->auth_type != REND_NO_AUTH &&
          !tor_mem_is_zero(rend_query->descriptor_cookie,