commit 8d691c7e292c1ac607b7dde1959ef3a70b8989fb Merge: 123643f 4c6c984 Author: Tomas Touceda <chiiph@gentoo.org> Date: Tue May 3 11:11:58 2011 -0300 Merge branch 'bug2821_bootstrap' src/vidalia/MainWindow.cpp | 14 +++++++++++++- src/vidalia/config/TorSettings.cpp | 27 +++++++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 9 +++++++++ 3 files changed, 49 insertions(+), 1 deletions(-)