[tor-commits] [vidalia/master] Fold in changes for 0.2.19

[chiiph at torproject.org]

commit 03552028d2598fe9b7622445ee8a39bc2a718a0d
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon May 28 20:56:47 2012 -0300

    Fold in changes for 0.2.19
---
 CHANGELOG                      |    7 +++++++
 changes/disableRunAtStart      |    3 ---
 changes/settings_automigration |    2 --
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b2a45a1..eedd1f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.2.19  28-May-2012
+  o Disable "Run Vidalia when my system starts" if the
+    BrowserExecutable config option is set. This will avoid issues with
+    TBB users starting Vidalia the wrong way.
+  o Automigrate TorExecutable, Torrc and DataDirectory config options
+    to the new relative path handling.
+
 0.2.18  14-May-2012
   o Use consensus bandwidth for routers when microdescriptors is
     enabled. Fixes bug 3287.
diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart
deleted file mode 100644
index f8890fc..0000000
--- a/changes/disableRunAtStart
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Disable "Run Vidalia when my system starts" if the
-    BrowserExecutable config option is set. This will avoid issues with
-    TBB users starting Vidalia the wrong way.
\ No newline at end of file
diff --git a/changes/settings_automigration b/changes/settings_automigration
deleted file mode 100644
index b832047..0000000
--- a/changes/settings_automigration
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Automigrate TorExecutable, Torrc and DataDirectory config options
-    to the new relative path handling.
\ No newline at end of file