From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Dec 2011 15:12:49 +0000 (-0500)
Subject: Allow prop110 violations if AllowNonearlyExtend is set in consensus
X-Git-Tag: tor-0.2.3.11-alpha~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0;p=thirdparty%2Ftor.git

Allow prop110 violations if AllowNonearlyExtend is set in consensus
---

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);