[vidalia-svn] r2065: Only let people who are running Tor 0.2.0.8-alpha or newer b (in trunk: . src/config src/gui/config src/gui/help/content/en)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-22 20:52:08 -0400 (Mon, 22 Oct 2007)
New Revision: 2065

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
   trunk/src/gui/config/serverpage.cpp
   trunk/src/gui/config/serverpage.ui
   trunk/src/gui/help/content/en/server.html
Log:
 r2189@lysithea:  edmanm | 2007-10-22 20:52:01 -0400
 Only let people who are running Tor 0.2.0.8-alpha or newer be a bridge relay.



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

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-10-23 00:20:25 UTC (rev 2064)
+++ trunk/src/config/serversettings.cpp	2007-10-23 00:52:08 UTC (rev 2065)
@@ -123,7 +123,7 @@
   
   /* If we're a bridge, don't publish our server descriptor */
   conf.insert(SETTING_PUBLISH_DESCRIPTOR,
-              (torVersion >= 0x020003 && isBridgeEnabled() ? "bridge" : "1"));
+              (torVersion >= 0x020008 && isBridgeEnabled() ? "bridge" : "1"));
 
   return conf;
 }

Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp	2007-10-23 00:20:25 UTC (rev 2064)
+++ trunk/src/gui/config/serverpage.cpp	2007-10-23 00:52:08 UTC (rev 2065)
@@ -129,7 +129,7 @@
 ServerPage::onAuthenticated()
 {
   quint32 torVersion = Vidalia::torControl()->getTorVersion();
-  if (torVersion < 0x020003) {
+  if (torVersion < 0x020008) {
     ui.rdoBridgeMode->setEnabled(false);
     if (ui.rdoBridgeMode->isChecked()) {
       int ret = VMessageBox::warning(this,

Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui	2007-10-23 00:20:25 UTC (rev 2064)
+++ trunk/src/gui/config/serverpage.ui	2007-10-23 00:52:08 UTC (rev 2065)
@@ -36,7 +36,7 @@
    <item>
     <widget class="QRadioButton" name="rdoBridgeMode" >
      <property name="text" >
-      <string>Help censored users reach the Tor network (Tor 0.2.0.3-alpha or newer)</string>
+      <string>Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)</string>
      </property>
     </widget>
    </item>

Modified: trunk/src/gui/help/content/en/server.html
===================================================================
--- trunk/src/gui/help/content/en/server.html	2007-10-23 00:20:25 UTC (rev 2064)
+++ trunk/src/gui/help/content/en/server.html	2007-10-23 00:52:08 UTC (rev 2065)
@@ -46,7 +46,7 @@
   <li>Select the <i>Relay</i> configuration page.</li>
   <li>
     Decide whether you want to run a normal Tor relay or a <i>bridge</i>
-    relay (Tor 0.2.0.3-alpha or newer). Bridge relays help censored Tor users
+    relay (Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users
     who are blocked from accessing the Tor network directly.
     Check the box labeled <i>Relay traffic for the Tor network</i> if you want
     to run a normal Tor relay or <i>Help censored users reach the Tor network</i>