From: Andrea Shepard <andrea@torproject.org>
Date: Tue, 29 Jan 2013 00:16:45 +0000 (-0800)
Subject: Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor
X-Git-Tag: tor-0.2.4.10-alpha~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=123daffb600cb1b581bee9dd576a980a06926f9c;p=thirdparty%2Ftor.git

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

123daffb600cb1b581bee9dd576a980a06926f9c
diff --cc src/or/or.h
index 251512dd31,409a603875..cfcddba3b2
--- a/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 {