commit 0a369b233523366c484761296c8b9369598dadbd Merge: a402fe2 e43e1c9 Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 9 10:48:02 2011 -0300

Merge branch 'bug3843_checkauto'

changes/bug3843 | 2 ++ src/vidalia/MainWindow.cpp | 20 +++++++++++++++++--- src/vidalia/config/AdvancedPage.cpp | 16 +++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-)