[tor-commits] [vidalia/master] Merge branch 'bug4048_unlinkportconf_backport'

[chiiph at torproject.org]

commit ab1ff7dd87c451737447d89cf483b644ef2825d0
Merge: b3775aa 9d475bc
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 13:18:29 2012 -0300

    Merge branch 'bug4048_unlinkportconf_backport'

 changes/bug4048            |    2 ++
 src/vidalia/MainWindow.cpp |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)