summaryrefslogtreecommitdiff
path: root/src/or/rendcache.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-19 07:58:43 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-19 07:58:43 -0500
commitde656474611c43f24dd5fff430de945b34b738bf (patch)
treee0d5e0e39839d1892afdeb55b8d7cb6f1d9b4bc7 /src/or/rendcache.c
parent169a93fff2510cf0eae76cdd198c19687bb1e875 (diff)
parentc11de4c45f5611a12fba005032941a40f5ce5f66 (diff)
downloadtor-de656474611c43f24dd5fff430de945b34b738bf.tar.gz
tor-de656474611c43f24dd5fff430de945b34b738bf.zip
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src/or/rendcache.c')
-rw-r--r--src/or/rendcache.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/rendcache.c b/src/or/rendcache.c
index e61a96b677..aa69d735fe 100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@ -915,7 +915,9 @@ 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.");
+ "provided invalid authorization data, or (maybe!) the "
+ "server is deliberately serving broken data in an attempt "
+ "to crash you with bug 21018.");
goto err;
} else if (n_intro_points > MAX_INTRO_POINTS) {
log_warn(LD_REND, "Found too many introduction points on a hidden "