[tor-commits] [vidalia/master] Fold in more changes