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