[or-cvs] r11195: Fix an XXX020 in or.h: BRIDGE != CONTROLLER. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-19 11:20:11 -0400 (Sun, 19 Aug 2007)
New Revision: 11195

Modified:
   tor/trunk/
   tor/trunk/src/or/or.h
Log:
 r14663 at catbus:  nickm | 2007-08-18 17:50:51 -0400
 Fix an XXX020 in or.h: BRIDGE != CONTROLLER.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14663] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-08-19 10:06:26 UTC (rev 11194)
+++ tor/trunk/src/or/or.h	2007-08-19 15:20:11 UTC (rev 11195)
@@ -1186,8 +1186,8 @@
 /** Tor should avoid using this router for circuit-building. */
 #define ROUTER_PURPOSE_CONTROLLER 1
 /** Tor should use this router only for bridge positions in circuits. */
-#define ROUTER_PURPOSE_BRIDGE 1
-  /*XXXX020 Should both of the above be 1? -NM */
+#define ROUTER_PURPOSE_BRIDGE 2
+
   uint8_t purpose; /** What positions in a circuit is this router good for? */
 
   /* The below items are used only by authdirservers for