[or-cvs] r15577: forward-port r15576 (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-06-30 19:27:11 -0400 (Mon, 30 Jun 2008)
New Revision: 15577

Modified:
   tor/trunk/src/or/circuituse.c
Log:
forward-port r15576


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2008-06-30 23:26:39 UTC (rev 15576)
+++ tor/trunk/src/or/circuituse.c	2008-06-30 23:27:11 UTC (rev 15577)
@@ -855,7 +855,7 @@
                               int flags)
 {
   origin_circuit_t *circ;
-  int onehop_tunnel = flags & CIRCLAUNCH_ONEHOP_TUNNEL;
+  int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0;
 
   if (!onehop_tunnel && !router_have_minimum_dir_info()) {
     log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling "