[vidalia-svn] r3519: Only set "PublishServerDescriptor bridge" if the Tor version (vidalia/trunk/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-14 00:26:47 -0500 (Sat, 14 Feb 2009)
New Revision: 3519

Modified:
   vidalia/trunk/src/vidalia/config/serversettings.cpp
Log:

Only set "PublishServerDescriptor bridge" if the Tor version is greater
than or equal to 0.2.0.8-alpha, but less than Tor 0.2.0.14-alpha.


Modified: vidalia/trunk/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/serversettings.cpp	2009-02-14 04:51:01 UTC (rev 3518)
+++ vidalia/trunk/src/vidalia/config/serversettings.cpp	2009-02-14 05:26:47 UTC (rev 3519)
@@ -121,8 +121,10 @@
   conf.insert(SETTING_CONTACT, scrub_email_addr(contact));
   
   /* If we're a bridge, don't publish our server descriptor */
-  conf.insert(SETTING_PUBLISH_DESCRIPTOR,
-              (torVersion >= 0x020008 && isBridgeEnabled() ? "bridge" : "1"));
+  if (torVersion < 0x020014) {
+    conf.insert(SETTING_PUBLISH_DESCRIPTOR,
+                (torVersion >= 0x020008 && isBridgeEnabled() ? "bridge" : "1"));
+  }
   if (torVersion >= 0x020013)
     conf.insert(SETTING_BRIDGE_RELAY, isBridgeEnabled() ? "1" : "0");
   return conf;