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