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