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

[chiiph at torproject.org]

commit ca90234b233ba1fb47d55f557564c51b81b91350
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Apr 2 14:01:38 2012 -0300

    Fold in more changes for 0.3.2
---
 CHANGELOG       |   13 ++++++++++++-
 changes/bug2727 |    3 ---
 changes/bug2905 |    6 ------
 changes/bug5518 |    4 ----
 changes/bug5522 |    3 ---
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index acccab1..a32871b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,13 @@
     connect to the tor process (ControlPort or ControlSocket and
     authentication) and everything else would be handled through the
     torrc file.
+  o In Network View, store layout of network map panes. Fixes ticket
+    2727.
+  o Add a wizard for the special cases where the user starts Vidalia
+    while tor has DisableNetwork=1 or the Panic feature enabled. This
+    wizard is meant to warn the user about either the Panic feature or
+    that she might need to configure a proxy or a bridge before tor
+    connects to the outside world. Fixes ticket 2905.
 
   Bugfixes relative to Vidalia 0.2.x:
   o Fix deadlock when the browser process fails to launch in OS X.
@@ -39,6 +46,9 @@
     used. Fixes bug 5277.
   o Fix the bridge line parsing for requests to bridges.torproject.org
     when the user clicks 'find bridges now'. Fixes bug 5730.
+  o In Advanced Settings tab, corrected radio buttons minimum sizes to
+    prevent hiding of socket controls on window resize. Fixes bug
+    5518.
 
   Bugfixes relative to Vidalia 0.3.x:
   o Center detached tabs to avoid placing them out of reach. Fixes bug
@@ -59,7 +69,8 @@
   o Migrate the code that handles Marble to the new library
     interface. It works as expected with the latest Marble from the
     upstream git repo.
-
+  o Always create settings access object, with default section name
+    set to General. Fixes bug 5522.
 
 0.3.1   27-Feb-2012
   o Draw the bandwidth graph curves based on the local maximum, not
diff --git a/changes/bug2727 b/changes/bug2727
deleted file mode 100644
index 1095804..0000000
--- a/changes/bug2727
+++ /dev/null
@@ -1,3 +0,0 @@
-  New Features:
-  o In Network View, store layout of network map panes. 
-    Fixes ticket 2727.
diff --git a/changes/bug2905 b/changes/bug2905
deleted file mode 100644
index 3eae285..0000000
--- a/changes/bug2905
+++ /dev/null
@@ -1,6 +0,0 @@
-  New Features:
-  o Add a wizard for the special cases where the user starts Vidalia
-    while tor has DisableNetwork=1 or the Panic feature enabled. This
-    wizard is meant to warn the user about either the Panic feature or
-    that she might need to configure a proxy or a bridge before tor
-    connects to the outside world. Fixes ticket 2905.
\ No newline at end of file
diff --git a/changes/bug5518 b/changes/bug5518
deleted file mode 100644
index f2323f9..0000000
--- a/changes/bug5518
+++ /dev/null
@@ -1,4 +0,0 @@
-  Bugfixes relative to Vidalia 0.2.x:
-  o In Advanced Settings tab, corrected radio buttons minimum sizes
-    to prevent hiding of socket controls on window resize.
-    Fixes bug 5518.
\ No newline at end of file
diff --git a/changes/bug5522 b/changes/bug5522
deleted file mode 100644
index 091756b..0000000
--- a/changes/bug5522
+++ /dev/null
@@ -1,3 +0,0 @@
-  Internal cleanups and improvements:
-  o Always create settings access object, with default section name
-    set to General. Fixes bug 5522.
\ No newline at end of file