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