commit 29eeb14d7e5924b44a26b5090c5fbb4435233662 Merge: 3668bd4 8ab2ccd Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 16 11:22:29 2011 -0300

Merge branch 'bug3898_auth' into alpha

changes/bug3898 | 3 + src/vidalia/MainWindow.cpp | 98 +++++++++++++++++++++++++++----------------- src/vidalia/MainWindow.h | 4 ++ 3 files changed, 67 insertions(+), 38 deletions(-)