commit 8c6782173e1b4044ab720fdd4f5976d6d6e7c3ea Merge: ff63bed baa7e2d Author: Tomás Touceda <chiiph@torproject.org> Date: Fri Mar 30 16:55:12 2012 -0300 Merge branch 'bug2905_disablenetwork' into alpha changes/bug2905 | 6 +++++ src/vidalia/CMakeLists.txt | 2 + src/vidalia/MainWindow.cpp | 33 ++++++++++++++++++++++++----- src/vidalia/MainWindow.h | 7 ++++++ src/vidalia/config/AdvancedPage.cpp | 20 ++++++++++++++++++ src/vidalia/config/AdvancedPage.h | 10 +++++++++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/NetworkSettings.cpp | 4 +++ src/vidalia/config/TorSettings.cpp | 25 ++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 6 +++++ src/vidalia/config/torrc/TorrcParser.cpp | 1 + 11 files changed, 109 insertions(+), 7 deletions(-)