[tor-commits] [vidalia/master] Fold in more changes

[chiiph at torproject.org]

commit be93b7dec53582becc92ceb235a62fa6855ffdf2
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Wed May 30 20:18:30 2012 -0300

    Fold in more changes
---
 CHANGELOG               |    6 +++++-
 changes/openssl_dep     |    2 --
 changes/win_static_ws32 |    2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index eedd1f7..1e027e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,13 @@
-0.2.19  28-May-2012
+0.2.19  30-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.
+  o Really get rid of the openssl dependency. The goal had been to
+    achieve that for 0.2.18, but not everything was actually removed.
+  o For static builds on windows, correctly link with zlib and
+    ws32_2.lib.
 
 0.2.18  14-May-2012
   o Use consensus bandwidth for routers when microdescriptors is
diff --git a/changes/openssl_dep b/changes/openssl_dep
deleted file mode 100644
index 91d5ac2..0000000
--- a/changes/openssl_dep
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Really get rid of the openssl dependency. The goal had been to
-    achieve that for 0.2.18, but not everything was actually removed.
diff --git a/changes/win_static_ws32 b/changes/win_static_ws32
deleted file mode 100644
index 49607ad..0000000
--- a/changes/win_static_ws32
+++ /dev/null
@@ -1,2 +0,0 @@
-  o For static builds on windows, correctly link with zlib and
-    ws32_2.lib.