[tor-commits] [vidalia/alpha] Merge branch 'bug4598_disableauto' into alpha