From 2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Dec 2011 10:12:49 -0500
Subject: [PATCH] Allow prop110 violations if AllowNonearlyExtend is set in
 consensus

---
 src/or/relay.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index fdc26006a0..e5790dc5eb 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1196,7 +1196,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
                "'extend' cell received for non-zero stream. Dropping.");
         return 0;
       }
-      if (cell->command != CELL_RELAY_EARLY) {
+      if (cell->command != CELL_RELAY_EARLY &&
+          !networkstatus_get_param(NULL,"AllowNonearlyExtend",0,0,1)) {
 #define EARLY_WARNING_INTERVAL 900
         static ratelim_t early_warning_limit =
           RATELIM_INIT(EARLY_WARNING_INTERVAL);