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

[andrea at torproject.org]

commit 123daffb600cb1b581bee9dd576a980a06926f9c
Merge: dfbd19d a78542f
Author: Andrea Shepard <andrea at torproject.org>
Date:   Mon Jan 28 16:16:45 2013 -0800

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

 changes/bug7802          |   11 +
 doc/tor.1.txt            |   31 ++-
 src/or/circuitbuild.c    |  618 +++++++++++++++++++++++++++++++++++++---------
 src/or/circuitbuild.h    |    3 +
 src/or/circuituse.c      |   30 ++-
 src/or/config.c          |    7 +-
 src/or/connection_edge.c |   28 ++-
 src/or/entrynodes.c      |   48 ++++-
 src/or/entrynodes.h      |    7 +-
 src/or/or.h              |   32 ++-
 src/or/relay.c           |    2 +-
 src/or/rendclient.c      |    9 +-
 src/or/rendservice.c     |   16 +-
 13 files changed, 691 insertions(+), 151 deletions(-)

diff --cc src/or/or.h
index 251512d,409a603..cfcddba
--- 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 {