From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Dec 2016 23:11:08 +0000 (-0500)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db58d4d16ff156b8827198b2732646c73eb59f14;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5
---

db58d4d16ff156b8827198b2732646c73eb59f14
diff --cc src/or/rendcommon.c
index bd701b217e,296df55664..9637d4d838
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@@ -1113,8 -1327,11 +1113,10 @@@ rend_cache_store_v2_desc_as_client(cons
                                                      intro_size);
      if (n_intro_points <= 0) {
        log_warn(LD_REND, "Failed to parse introduction points. Either the "
-                "service has published a corrupt descriptor or you have "
-                "provided invalid authorization data.");
+                "service has published a corrupt descriptor, or you have "
+                "provided invalid authorization data, or (maybe!) the "
+                "server is deliberately serving broken data in an attempt "
+                "to crash you with bug 21018.");
 -      retval = -2;
        goto err;
      } else if (n_intro_points > MAX_INTRO_POINTS) {
        log_warn(LD_REND, "Found too many introduction points on a hidden "