Merge remote-tracking branch 'public/bug11553_024' into bug11553_025

Conflicts:
	src/or/channel.h

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

diff --cc src/or/channel.h
index 7ec222df0f8a1932ad50149721e52a1458da4e2b,e63c94961fa2c4312e80d81f88bfbabb44cc0f64..de19fad9a58b3a8f1b3a62b3745521b485b5fb1b
--- 1/src/or/channel.h
--- 2/src/or/channel.h
+++ b/src/or/channel.h
@@@ -146,19 -145,16 +146,16 @@@ struct channel_s 
     * When we send CREATE cells along this connection, which half of the
     * space should we use?
     */
 -  ENUM_BF(circ_id_type_t) circ_id_type:2;
 +  circ_id_type_bitfield_t circ_id_type:2;
    /** DOCDOC*/
    unsigned wide_circ_ids:1;
-   /**
-    * Which circ_id do we try to use next on this connection?  This is
-    * always in the range 0..1<<15-1.
-    */
-   circid_t next_circ_id;
+   /** Have we logged a warning about circID exhaustion on this channel? */
+   unsigned warned_circ_ids_exhausted:1;
  
 -  /* For how many circuits are we n_chan?  What about p_chan? */
 +  /** For how many circuits are we n_chan?  What about p_chan? */
    unsigned int num_n_circuits, num_p_circuits;
  
 -  /*
 +  /**
     * True iff this channel shouldn't get any new circs attached to it,
     * because the connection is too old, or because there's a better one.
     * More generally, this flag is used to note an unhealthy connection;

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

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