From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Apr 2014 17:00:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug11553_024' into bug11553_025
X-Git-Tag: tor-0.2.5.4-alpha~22^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd169aa9a512857fe95fa0cbe44e4e6dbc2c800f;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/channel.h
---

bd169aa9a512857fe95fa0cbe44e4e6dbc2c800f
diff --cc src/or/channel.h
index 7ec222df0f,e63c94961f..de19fad9a5
--- a/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;