[tor-commits] [vidalia/alpha] Merge remote-tracking branch 'runa/master'