commit db58d4d16ff156b8827198b2732646c73eb59f14 Merge: 3d2d3f2 0fb3058 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 20 18:11:08 2016 -0500
Merge branch 'maint-0.2.4' into maint-0.2.5
changes/bug21018 | 11 +++++++++++ src/or/rendcommon.c | 6 ++++-- src/or/routerparse.c | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-)
diff --cc src/or/rendcommon.c index bd701b2,296df55..9637d4d --- a/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 "