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