[tor-commits] [vidalia/alpha] clean up some of the strings in the upcoming changelog

[chiiph at torproject.org]

commit 69de57c9a65330d8b366e5958939ae34418a310f
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Mar 26 18:02:36 2012 -0400

    clean up some of the strings in the upcoming changelog
---
 CHANGELOG |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cd0ae43..9701587 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,24 +1,24 @@
 0.3.2   ??-???-2012
   o Classify circuits based on their purpose. This will help users
-    understand that nothing is wrong when Tor builds a one hop
+    understand that nothing is wrong when Tor builds a one-hop
     circuit, for example. Fixes bug 2114.
   o Add option to use search query as message log filter. Fixes
     ticket 2733.
   o Add a new configured relay immediately to the list of relays in
-    the Network Map. Also document why a relay might be offline of not
+    the Network Map. Also document why a relay might be offline or not
     in the consensus/router list. Fixes bug 2735.
   o Add accounting options to the relay configuration panel. Fixes bug
     2944.
   o Use consensus bandwidth for routers when microdescriptors is
     enabled. Fixes bug 3287.
-  o Improve a method that didn't returned the specified type if
+  o Improve a method that didn't return the specified type if
     another control method was selected. Fixes bug 4065.
-  o Add a Panic button. Some users want to get rid of the Tor Browser
-    Bundle quickly in certain circumstances, this button does exactly
-    that but with a simple erease, not some secure method. Resolves
-    ticket 4107.
-  o Handle tor's bootstrap phases in a more generic way. Fixes bug
-    5109.
+  o Add a Panic button, for users who want to get rid of the Tor Browser
+    Bundle quickly in certain circumstances. It uses a simple erase,
+    rather than a secure erase method. Resolves ticket 4107.
+  o Handle unrecognized Tor bootstrap phases. (Tor tells us a summary
+    description of each bootstrap phase as it occurs, so we can use that
+    string if needed.) Fixes bug 5109.
   o Change the wording from New Identity to New Circuit. For a proper
     New Identity while browsing, TorButton's solution should be
     used. Fixes bug 5277.
@@ -29,8 +29,9 @@
   o Do not ignore the Show on Startup checkbox. Fixes bug 5351.
   o Fix the bridge line parsing for requests to
     bridges.torproject.org. Fixes bug 5730.
-  o Remove the proxy settings handling since we do not use it
-    anymore. Fix bug 5386.
+  o Remove the ability to launch an http proxy (e.g. Polipo), since we
+    do not use it anymore. In the future, perhaps a plugin will allow
+    users to launch external applications like this. Fix bug 5386.
   o Fix deadlock when the browser process failed to launch in OSX.
   o Removes the need for threads to handle interaction with the
     ControlPort. It now uses asynchronous IO through Qt's event loop.
@@ -41,7 +42,8 @@
     configuration option or fall back to the hardcoded default if the
     key isn't present.
   o Improve the bootstrap behavior for the new async TorControl.
-  o Add support for Microdescriptors. Fixes ticket 4203.
+  o Resume listing relays in the Network Map panel even when Tor
+    only offers microdescriptors (new in Tor 0.2.3.x). Fixes ticket 4203.
   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.