commit 5883f5d2e894af1b5dbfdbb3830c51645599850a Merge: 4426009 6d73fde Author: Tomás Touceda <chiiph@torproject.org> Date: Mon Jan 23 11:50:11 2012 -0300 Merge branch 'bug4598_disableauto' into alpha changes/bug4598 | 2 ++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/TorSettings.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletions(-)