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