[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

[nickm@xxxxxxxxxxxxxx]

commit 047555214056da24d682d47562a88e53563e49ff
Merge: 929a8f1 fe69a7e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Apr 6 09:26:16 2015 -0400

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

 changes/bug15600     |    5 +++++
 changes/bug15601     |    4 ++++
 src/or/rendcommon.c  |    2 +-
 src/or/rendservice.c |   10 ++++++++++
 src/or/routerparse.c |   14 +++++++++-----
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --cc src/or/rendcommon.c
index 866f4fb,bd701b2..5fdd13e
--- 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,

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits