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

diff --cc src/or/rendcommon.c
index 866f4fb026afe6a4e7f03012f815ed32dcbfe231,bd701b217ef7895314ee4d26a5d05ada3f433e5f..5fdd13efce47cf8b4d4de210bf775103fdf14202
--- 1/src/or/rendcommon.c
--- 2/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,

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/or/routerparse.c
Simple merge