commit 2b34839bd5be6218b05c8cba4dbd0476df482ec7 Author: Erinn Clark erinn@torproject.org Date: Fri Nov 30 20:07:59 2012 +0000

Update Changelog and bump Vidalia to 0.2.21 --- CHANGELOG | 10 ++++++++++ CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG index f485707..e673e01 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +0.2.21 30-Nov-2012 + o Don't wait so long before attempting to reload the router list if the ns/all + command returned empty. Fixes bug 6483. + o Stop trying to load router information if torControl is not connected + anymore. Fixes bug 6482. + o Save ControlPortWriteToFile with a relative path instead of an absolute + one. Fixes bug 6568. + o Fix RouterDescriptor's bandwidth and uptime values when defined from the + consensus. Fixes bug 6601. + 0.2.20 10-Jul-2012 o Append router status information if Tor is using microdescriptors. o Display paths with their native separators. Resolves ticket 4337. diff --git a/CMakeLists.txt b/CMakeLists.txt index 2135867..ae6e39e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@

set(VER_MAJOR "0") set(VER_MINOR "2") -set(VER_PATCH "20") +set(VER_PATCH "21") set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)