[tor-commits] [vidalia/master] Update the CHANGELOG and bump the version number to 0.2.14

[chiiph at torproject.org]

commit 4641a188a85f5b47adfeba0172896e9ec2f4c928
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Aug 26 11:09:09 2011 -0300

    Update the CHANGELOG and bump the version number to 0.2.14
---
 CHANGELOG      |    5 +++++
 CMakeLists.txt |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1b059cf..f39003e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+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
+    inside Tor Browser Bundle.
+
 0.2.13  10-Aug-2011
   o Add a way to bootstrap Tor's torrc file (copy the torrc to a given
     directory before Vidalia starts) so that packages such as
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 438a1be..18f2575 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 set(VER_MAJOR   "0")
 set(VER_MINOR   "2")
-set(VER_PATCH   "13")
+set(VER_PATCH   "14")
 set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
 message(STATUS  "Configuring Vidalia ${VERSION}")
 project(Vidalia)