[tor-commits] [tor/master] Refrain from mentioning old bug in a warning

[nickm at torproject.org]

commit eb7a3fae08638e38e55014b293d347d500cf14fa
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Wed May 30 19:44:20 2018 +0200

    Refrain from mentioning old bug in a warning
---
 changes/bug25477   | 3 +++
 src/or/rendcache.c | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changes/bug25477 b/changes/bug25477
new file mode 100644
index 000000000..0eac06137
--- /dev/null
+++ 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
index d27e1c293..854142c26 100644
--- 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 "