[tor-commits] [tor/master] Merge branch 'prop221_squashed_024'

[nickm at torproject.org]

commit 12dc55f4878d16bfc3fb6789b31494d47df7ccec
Merge: dde41fa 5de88dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 1 10:28:01 2013 -0400

    Merge branch 'prop221_squashed_024'
    
    Conflicts:
    	src/or/or.h

 changes/prop221       |    6 ++++++
 doc/tor.1.txt         |    8 +++++---
 src/or/circuitbuild.c |    8 +++++---
 src/or/circuituse.c   |    9 +++++----
 src/or/command.c      |    1 +
 src/or/config.c       |    2 +-
 src/or/or.h           |    3 +++
 7 files changed, 26 insertions(+), 11 deletions(-)

diff --cc src/or/or.h
index 92c0692,ad91f7d..a313248
--- 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? */