Merge branch 'bug9072-024' into bug9072-025

diff --cc src/or/relay.c
index 58ca4e957c538aeed8df1e1258c7d72aa8474414,0f21663bcd088bc6660e163c6edf6ccf08a3b209..38776bcd9a4f1424b3e58a2560a3c9f9489309c8
--- 1/src/or/relay.c
--- 2/src/or/relay.c
+++ b/src/or/relay.c
@@@ -58,7 -58,6 +58,9 @@@ static void adjust_exit_policy_from_exi
                                                    entry_connection_t *conn,
                                                    node_t *node,
                                                    const tor_addr_t *addr);
++#if 0
 +static int get_max_middle_cells(void);
++#endif
  
  /** Stop reading on edge connections when we have this many cells
   * waiting on the appropriate queue. */
@@@ -2473,18 -2459,6 +2475,20 @@@ channel_flush_from_first_active_circuit
    return n_flushed;
  }
  
++#if 0
 +/** Indicate the current preferred cap for middle circuits; zero disables
 + * the cap.  Right now it's just a constant, ORCIRC_MAX_MIDDLE_CELLS, but
 + * the logic in append_cell_to_circuit_queue() is written to be correct
 + * if we want to base it on a consensus param or something that might change
 + * in the future.
 + */
 +static int
 +get_max_middle_cells(void)
 +{
 +  return ORCIRC_MAX_MIDDLE_CELLS;
 +}
++#endif
 +
  /** Add <b>cell</b> to the queue of <b>circ</b> writing to <b>chan</b>
   * transmitting in <b>direction</b>. */
  void
@@@ -2495,7 -2469,6 +2499,9 @@@ append_cell_to_circuit_queue(circuit_t 
    or_circuit_t *orcirc = NULL;
    cell_queue_t *queue;
    int streams_blocked;
++#if 0
 +  uint32_t tgt_max_middle_cells, p_len, n_len, tmp, hard_max_middle_cells;
++#endif
  
    if (circ->marked_for_close)
      return;
@@@ -2585,8 -2509,9 +2595,9 @@@
        }
      }
    }
+ #endif
  
 -  cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);
 +  cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids, 1);
  
    /* If we have too many cells on the circuit, we should stop reading from
     * the edge streams for a while. */