[vidalia-svn] r3644: Backport r3643. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-24 15:46:03 -0400 (Tue, 24 Mar 2009)
New Revision: 3644

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/config/serverpage.ui
Log:

Backport r3643.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-24 19:43:25 UTC (rev 3643)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-24 19:46:03 UTC (rev 3644)
@@ -1,3 +1,8 @@
+0.1.13  xx-xxx-2009
+  o Remove an old warning on the relay settings page that running a bridge
+    relay requires Tor 0.2.0.8-alpha or newer.
+
+
 0.1.12  16-Mar-2009
   o Fix a bug in the hidden service settings configuration class that
     could lead to compile errors in Visual Studio and on IRIX.

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/serverpage.ui	2009-03-24 19:43:25 UTC (rev 3643)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/serverpage.ui	2009-03-24 19:46:03 UTC (rev 3644)
@@ -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.8-alpha or newer)</string>
+      <string>Help censored users reach the Tor network</string>
      </property>
     </widget>
    </item>