[tor-commits] [vidalia/master] Merge branch 'bug3759_basiclog_backport'