[tor-commits] [vidalia/master] Version bump and fold in changes for 0.2.15 release

[chiiph at torproject.org]

commit 1de8f44b56f6d8c8632754e3d2e2282c1995a045
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Oct 7 15:56:03 2011 -0300

    Version bump and fold in changes for 0.2.15 release
---
 CHANGELOG      |   18 ++++++++++++++++++
 CMakeLists.txt |    2 +-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f39003e..9803ecf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+0.2.15  07-Oct-2011
+  o Draw the bandwidth graph curves based on the local maximum, not
+    the global maximum. Fixes bug 2188.
+  o Add an option for setting up a non-exit relay to the Sharing configuration
+    panel. This is meant to clarify what an exit policy and an exit relay are.
+    Resolves bug 2644.
+  o Display time statistics for bridges in UTC time, rather than local
+    time. Fixes bug 3342.
+  o Change the parameter for ordering the entries in the Basic Log
+    list from currentTime to currentDateTime to avoid missplacing
+    entries from different days.
+  o Check the tor version and that settings are sanitized before
+    trying to use the port autoconfiguration feature. Fixes bug 3843.
+  o Provide a way to hide Dock or System Tray icons in OSX. Resolves
+    ticket 2163.
+  o Make new processes appear at front when they are started (OSX
+    specific).
+
 0.2.14  26-Aug-2011
   o Make the AutoPort setting default to false, so that it doesn't
     break backwards compatibility for people that aren't using Vidalia
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6906313..9303d6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@
 set(VER_MAJOR   "0")
 set(VER_MINOR   "2")
 set(VER_PATCH   "15")
-set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git")
+set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
 message(STATUS  "Configuring Vidalia ${VERSION}")
 project(Vidalia)