diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-20 18:11:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-20 18:11:08 -0500 |
| commit | db58d4d16ff156b8827198b2732646c73eb59f14 (patch) | |
| tree | 0fd918e7660790b133352985366bce71b007cb20 /src/or/rendcommon.c | |
| parent | 3d2d3f2b62a361552f893b85e5b0d356be0a9261 (diff) | |
| parent | 0fb3058eced5dce355d777288bd9ec255b875db4 (diff) | |
| download | tor-db58d4d16ff156b8827198b2732646c73eb59f14.tar.gz tor-db58d4d16ff156b8827198b2732646c73eb59f14.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index bd701b217e..9637d4d838 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1113,8 +1113,10 @@ rend_cache_store_v2_desc_as_client(const char *desc, 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."); goto err; } else if (n_intro_points > MAX_INTRO_POINTS) { log_warn(LD_REND, "Found too many introduction points on a hidden " |