Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor

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

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

diff --cc src/or/or.h
index 251512dd315a97451531b4a16eff0c4cdbb55ca0,409a603875e8623d87b026e6657254514c08140b..cfcddba3b2f8272613f9b78718fd318cc29832b8
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -2998,11 -3013,8 +3014,10 @@@ typedef struct origin_circuit_t 
     * ISO_STREAM. */
    uint64_t associated_isolated_stream_global_id;
    /**@}*/
- 
  } origin_circuit_t;
  
 +struct onion_queue_t;
 +
  /** An or_circuit_t holds information needed to implement a circuit at an
   * OR. */
  typedef struct or_circuit_t {