commit 4393ba15d9f15459ba9d9b44f03bbb6de1caf360 Merge: 770ba61 05681cc Author: Tomás Touceda chiiph@torproject.org Date: Wed Sep 7 10:39:52 2011 -0300

Merge branch 'bug3077_auto' into alpha

src/vidalia/MainWindow.cpp | 89 +++++++++++++++++++++++++++++----- src/vidalia/config/AdvancedPage.cpp | 33 ++++++++++++- src/vidalia/config/AdvancedPage.h | 3 + src/vidalia/config/AdvancedPage.ui | 19 +++++-- src/vidalia/config/TorSettings.cpp | 14 ++++++ src/vidalia/config/TorSettings.h | 7 +++ 6 files changed, 144 insertions(+), 21 deletions(-)