[vidalia-svn] r2174: If the user is running a bridge with Tor 0.2.0.13-alpha or n (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-04 15:23:15 -0500 (Tue, 04 Dec 2007)
New Revision: 2174

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
Log:
 r2224@lysithea:  edmanm | 2007-12-04 15:23:12 -0500
 If the user is running a bridge with Tor 0.2.0.13-alpha or newer, then set
 'BridgeRelay 1'.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2224] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-12-04 20:15:55 UTC (rev 2173)
+++ trunk/src/config/serversettings.cpp	2007-12-04 20:23:15 UTC (rev 2174)
@@ -48,6 +48,7 @@
 #define SETTING_EXITPOLICY      "ExitPolicy"
 #define SETTING_BANDWIDTH_RATE  "BandwidthRate"
 #define SETTING_BANDWIDTH_BURST "BandwidthBurst"
+#define SETTING_BRIDGE_RELAY    "BridgeRelay"
 #define SETTING_RELAY_BANDWIDTH_RATE   "RelayBandwidthRate"
 #define SETTING_RELAY_BANDWIDTH_BURST  "RelayBandwidthBurst"
 #define SETTING_PUBLISH_DESCRIPTOR     "PublishServerDescriptor"
@@ -126,7 +127,8 @@
   /* If we're a bridge, don't publish our server descriptor */
   conf.insert(SETTING_PUBLISH_DESCRIPTOR,
               (torVersion >= 0x020008 && isBridgeEnabled() ? "bridge" : "1"));
-
+  if (torVersion >= 0x020013)
+    conf.insert(SETTING_BRIDGE_RELAY, isBridgeEnabled() ? "1" : "0");
   return conf;
 }