tor

commit 16dd2f7bb0df8c6d45d62e4d515089a3a566fd8e
parent 5746e210b8d0dfc54447ca31d6b2ac55a13271cc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sun, 17 Jun 2018 20:25:40 -0400

Merge remote-tracking branch 'rl1987/bug25477'

Diffstat:
A
changes/bug25477
 | 
3
+++
M
src/or/rendcache.c
 | 
4
+---

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/changes/bug25477 b/changes/bug25477
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging):
+    - Refrain from mentioning bug 21018, as it is already fixed.
+      Fixes bug 25477; bugfix on 0.2.9.8.
diff --git a/src/or/rendcache.c b/src/or/rendcache.c
@@ -908,9 +908,7 @@ rend_cache_store_v2_desc_as_client(const char *desc,
     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, or (maybe!) the "
-               "server is deliberately serving broken data in an attempt "
-               "to crash you with bug 21018.");
+               "provided invalid authorization data.");
       goto err;
     } else if (n_intro_points > MAX_INTRO_POINTS) {
       log_warn(LD_REND, "Found too many introduction points on a hidden "