commit 578c12c4ac2c5cc087f42f1489de2c5f70e11889 Author: Tomás Touceda chiiph@torproject.org Date: Mon Jul 9 22:03:05 2012 -0300

Fold in changes and bump version to 0.3.3-alpha --- CHANGELOG | 49 ++++++++++++++++++++++++++++++++++ CMakeLists.txt | 16 +++++----- changes/TorrcPrototype | 3 -- changes/bug2726 | 3 -- changes/bug2731 | 3 -- changes/bug4337 | 1 - changes/bug5107 | 3 -- changes/bug5123 | 3 -- changes/bug5495 | 2 - changes/bug5554 | 3 -- changes/bug5855 | 3 -- changes/bug6130 | 3 -- changes/bug6178 | 2 - changes/bug6216 | 3 -- changes/bug6243 | 3 -- changes/bug6249 | 3 -- changes/disableRunAtStart | 3 -- changes/external-prototype-macros | 3 -- changes/fixRouterOfflineNotification | 3 -- changes/migrateToExtensions | 3 -- changes/pickExitNodes | 9 ------ 21 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG index 3c903b8..be1235b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,52 @@ +0.3.3 09-Jul-12 + New features: + o Added plugin prototype for Torrc class. This allows plugins to + modify the .torrc configuration file. + o Display node fingerprint in the details panel in the Network Map. + Resolves ticket 2726. + o Adds Settings frame for Network Map with optional columns for + Relay panel. Resolves ticket 2731. + o Set what version of Vidalia wrote the configuration file. Resolves + ticket 5123. + o Hide window with Ctrl+W shortcut. Resolves ticket 5495. + o Use SafeCookie authentication method if available instead of the + regular cookie authentication. Resolves ticket 5855. + o Display how much traffic runs through each stream in the Network + Map. Resolves ticket 6249. + o Provide a way of hand picking entry and exit nodes from the router + list in the Network Map. + + Bugfixes relative to Vidalia 0.2.x: + o Automatically add a bridge if it is in the lineEdit but the user + haven't pressed the plus button. Fixes bug 5107. + o Display paths with their native separators. Resolves ticket 4337. + o Disable "Run Vidalia when my system starts" if the + BrowserExecutable config option is set. This will avoid issues with + TBB users starting Vidalia the wrong way. + + Bugfixes relative to Vidalia 0.3.x: + o Don't write values that are default in torrc. Fixes bug 6178. + o Fix segmentation fault when trying to close an already closed + circuit in the Network Map. Fixes bug 6243. + o Show the "Why is my relay offline?" notification only if tor is + running one and it's marked as offline. + + Internal cleanups and improvements: + o Fixed compile time warning when generating ui_AdvancedPage.h. + Fixes bug 5554. + o Enlarge countries' list and make CountryInfo.cpp, + country-coordinates.csv and geoip consistent. + o Improve Network Map router loading performance by disabling + sorting with every addition. Resolves ticket 6216. + o Created prototypemacros.h to store the preprocessor macros used by + TorControlPrototype + o Migrate from the hand made TorControl prototype for QtScript to an + automatically generated equivalent with qtscriptgenerator. + o Fix return value from VMessageBox::question. + o Make TorControl::getRouterDescriptorText() default to regular + descriptors in case the microdescriptor is not available. + o Improve handling of ControlPort and SocksPort settings. + 0.3.2 30-May-2012 New features: o In the Network Map window, classify circuits based on their diff --git a/CMakeLists.txt b/CMakeLists.txt index a16b20d..021de50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If +## LICENSE file, found in the top level directory of this distribution. If ## you did not receive the LICENSE file with this file, you may obtain it ## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed +## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +## including this file, may be copied, modified, propagated, or distributed ## except according to the terms described in the LICENSE file. ##

@@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "3") set(VER_PATCH "3") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-alpha") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

@@ -58,7 +58,7 @@ if(MSVC_IDE) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) endif(MSVC_IDE) - + ## Define Vidalia-specific CMake options if (APPLE) option(OSX_TIGER_COMPAT "Build an OS X 10.4 Compatible Vidalia." OFF) @@ -71,7 +71,7 @@ if (APPLE)

option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF) if (OSX_FAT_BINARY) - set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "OS X build architectures" FORCE) set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4" CACHE STRING "Flags used by the linker." FORCE) @@ -82,7 +82,7 @@ if (APPLE) option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF) if (OSX_FORCE_32BIT) add_definitions(-m32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "Flags used by the linker." FORCE) endif(OSX_FORCE_32BIT) endif(APPLE) diff --git a/changes/TorrcPrototype b/changes/TorrcPrototype deleted file mode 100644 index 3851322..0000000 --- a/changes/TorrcPrototype +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Added plugin prototype for Torrc class. This allows plugins to - modify the .torrc configuration file. diff --git a/changes/bug2726 b/changes/bug2726 deleted file mode 100644 index fbe2380..0000000 --- a/changes/bug2726 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Display node fingerprint in the details panel in the Network Map. Resolves - ticket 2726. diff --git a/changes/bug2731 b/changes/bug2731 deleted file mode 100644 index a7033ac..0000000 --- a/changes/bug2731 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Adds Settings frame for Network Map with optional - columns for Relay panel. Resolves ticket 2731. diff --git a/changes/bug4337 b/changes/bug4337 deleted file mode 100644 index f5703d3..0000000 --- a/changes/bug4337 +++ /dev/null @@ -1 +0,0 @@ - o Display paths with their native separators. Resolves ticket 4337. diff --git a/changes/bug5107 b/changes/bug5107 deleted file mode 100644 index 47ba055..0000000 --- a/changes/bug5107 +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.2.x: - o Automatically add a bridge if it is in the lineEdit but the user haven't - pressed the plus button. Fixes bug 5107. diff --git a/changes/bug5123 b/changes/bug5123 deleted file mode 100644 index 6abe02c..0000000 --- a/changes/bug5123 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Set what version of Vidalia wrote the configuration file. Resolves ticket - 5123. diff --git a/changes/bug5495 b/changes/bug5495 deleted file mode 100644 index 5d50307..0000000 --- a/changes/bug5495 +++ /dev/null @@ -1,2 +0,0 @@ - New features: - o Hide window with Ctrl+W shortcut. Resolves ticket 5495. diff --git a/changes/bug5554 b/changes/bug5554 deleted file mode 100644 index 7164d7e..0000000 --- a/changes/bug5554 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Fixed compile time warning when generating ui_AdvancedPage.h. - Fixes bug 5554. \ No newline at end of file diff --git a/changes/bug5855 b/changes/bug5855 deleted file mode 100644 index 610aae8..0000000 --- a/changes/bug5855 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Use SafeCookie authentication method if available instead of the regular - cookie authentication. Resolves ticket 5855. diff --git a/changes/bug6130 b/changes/bug6130 deleted file mode 100644 index bbc18c7..0000000 --- a/changes/bug6130 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Enlarge countries' list and make CountryInfo.cpp, - country-coordinates.csv and geoip consistent. diff --git a/changes/bug6178 b/changes/bug6178 deleted file mode 100644 index 910ef8e..0000000 --- a/changes/bug6178 +++ /dev/null @@ -1,2 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Don't write values that are default in torrc. Fixes bug 6178. diff --git a/changes/bug6216 b/changes/bug6216 deleted file mode 100644 index 9484f75..0000000 --- a/changes/bug6216 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Improve Network Map router loading performance by disabling sorting with - every addition. Resolves ticket 6216. diff --git a/changes/bug6243 b/changes/bug6243 deleted file mode 100644 index 2b51ca5..0000000 --- a/changes/bug6243 +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Fix segmentation fault when trying to close an already closed circuit in - the Network Map. Fixes bug 6243. diff --git a/changes/bug6249 b/changes/bug6249 deleted file mode 100644 index ab72fb6..0000000 --- a/changes/bug6249 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Display how much traffic runs through each stream in the Network Map. - Resolves ticket 6249. diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart deleted file mode 100644 index f8890fc..0000000 --- a/changes/disableRunAtStart +++ /dev/null @@ -1,3 +0,0 @@ - o Disable "Run Vidalia when my system starts" if the - BrowserExecutable config option is set. This will avoid issues with - TBB users starting Vidalia the wrong way. \ No newline at end of file diff --git a/changes/external-prototype-macros b/changes/external-prototype-macros deleted file mode 100644 index 6ae144b..0000000 --- a/changes/external-prototype-macros +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Created prototypemacros.h to store the preprocessor macros - used by TorControlPrototype diff --git a/changes/fixRouterOfflineNotification b/changes/fixRouterOfflineNotification deleted file mode 100644 index 04c38ba..0000000 --- a/changes/fixRouterOfflineNotification +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Show the "Why is my relay offline?" notification only if tor is - running one and it's marked as offline. diff --git a/changes/migrateToExtensions b/changes/migrateToExtensions deleted file mode 100644 index 36c6a3b..0000000 --- a/changes/migrateToExtensions +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Migrate from the hand made TorControl prototype for QtScript to an - automatically generated equivalent with qtscriptgenerator. diff --git a/changes/pickExitNodes b/changes/pickExitNodes deleted file mode 100644 index 8751db8..0000000 --- a/changes/pickExitNodes +++ /dev/null @@ -1,9 +0,0 @@ - New features: - o Provide a way of hand picking entry and exit nodes from the - router list in the Network Map. - - Internal cleanups and improvements: - o Fix return value from VMessageBox::question. - o Make TorControl::getRouterDescriptorText() default to regular - descriptors in case the microdescriptor is not available. - o Improve handling of ControlPort and SocksPort settings.