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

[chiiph at torproject.org]

commit 8035b4639d9d83c15693f58d21e7fcbeed71f2f7
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Wed May 30 20:37:58 2012 -0300

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

diff --git a/CHANGELOG b/CHANGELOG
index 89728af..3c903b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-0.3.2   ??-???-2012
+0.3.2   30-May-2012
   New features:
   o In the Network Map window, classify circuits based on their
     purpose. This will help users understand that nothing is wrong
@@ -90,6 +90,10 @@
     port.conf so that Vidalia does not freeze.
   o Make sure there is a ReceiveWaiter in the queue before issuing a
     ControlCommand to avoid deadlocks in the event loop.
+  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.3.1   27-Feb-2012
   o Draw the bandwidth graph curves based on the local maximum, not
diff --git a/changes/openssl_dep b/changes/openssl_dep
deleted file mode 100644
index dc27cd1..0000000
--- a/changes/openssl_dep
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplifications and refactoring:
-    - 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 5cb5067..0000000
--- a/changes/win_static_ws32
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Build fixes:
-    - For static builds on windows, correctly link with zlib and
-      ws32_2.lib.
-