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