Merge branch 'maint-0.2.4' into maint-0.2.5

diff --cc src/or/rendcommon.c
index bd701b217ef7895314ee4d26a5d05ada3f433e5f,296df556642599a420cbde3b75c62b7656974cc6..9637d4d838be174b3f895499656d2c160895fa52
--- 1/src/or/rendcommon.c
--- 2/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 "

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