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