commit e25686f77ff06874445d3c25f23cefa9ff6c5c61 Merge: 7041eb8 f927240 Author: Tomás Touceda chiiph@torproject.org Date: Mon Jan 23 10:59:53 2012 -0300

Merge branch 'bug3064_passphrase' into alpha

changes/bug3064 | 2 ++ src/vidalia/config/AdvancedPage.cpp | 11 +++++++++++ src/vidalia/config/AdvancedPage.h | 3 +++ src/vidalia/config/AdvancedPage.ui | 14 ++++++++++++-- 4 files changed, 28 insertions(+), 2 deletions(-)