Merge branch 'prop221_squashed_024'

Conflicts:
	src/or/or.h

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/command.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/or.h
index 92c0692b683f294178b87cd8f4c4f6bf42917718,ad91f7da29654d656d201528e3fbdec5e4ae0e64..a313248500cf46748bd5edd099dbb9172f71f19f
--- 1/src/or/or.h
--- 2/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? */