From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Nov 2013 14:28:01 +0000 (-0400)
Subject: Merge branch 'prop221_squashed_024'
X-Git-Tag: tor-0.2.5.2-alpha~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12dc55f4878d16bfc3fb6789b31494d47df7ccec;p=thirdparty%2Ftor.git

Merge branch 'prop221_squashed_024'

Conflicts:
	src/or/or.h
---

12dc55f4878d16bfc3fb6789b31494d47df7ccec
diff --cc src/or/or.h
index 92c0692b68,ad91f7da29..a313248500
--- a/src/or/or.h
+++ b/src/or/or.h
@@@ -2891,13 -2799,9 +2891,16 @@@ typedef struct circuit_t 
     * allowing n_streams to add any more cells. (OR circuit only.) */
    unsigned int streams_blocked_on_p_chan : 1;
  
 +  /** True iff we have queued a delete backwards on this circuit, but not put
 +   * it on the output buffer. */
 +  unsigned int p_delete_pending : 1;
 +  /** True iff we have queued a delete forwards on this circuit, but not put
 +   * it on the output buffer. */
 +  unsigned int n_delete_pending : 1;
 +
+   /** True iff this circuit has received a DESTROY cell in either direction */
+   unsigned int received_destroy : 1;
+ 
    uint8_t state; /**< Current status of this circuit. */
    uint8_t purpose; /**< Why are we creating this circuit? */