[vidalia-svn] r2039: Don't try to "setconf PublishServerDescriptor bridge" if we' (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-19 00:53:46 -0400 (Fri, 19 Oct 2007)
New Revision: 2039

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
Log:
 r2139@lysithea:  edmanm | 2007-10-19 00:49:32 -0400
 Don't try to "setconf PublishServerDescriptor bridge" if we're running a Tor
 older than 0.2.0.3-alpha.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2139] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-10-18 16:22:41 UTC (rev 2038)
+++ trunk/src/config/serversettings.cpp	2007-10-19 04:53:46 UTC (rev 2039)
@@ -118,7 +118,7 @@
   
   /* If we're a bridge, don't publish our server descriptor */
   conf.insert(SETTING_PUBLISH_DESCRIPTOR,
-              (isBridgeEnabled() ? "bridge" : "1"));
+              (torVersion >= 0x020003 && isBridgeEnabled() ? "bridge" : "1"));
 
   return conf;
 }