[tor-commits] [tlsdate/debian-master] Merge branch 'master' into debian-master

[ioerror at torproject.org]

commit 6138ec9ebf76c745fb9af75cbad95ad8ed141057
Merge: 6dbec6b a0bf19f
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Mon Apr 15 18:35:57 2013 -0700

    Merge branch 'master' into debian-master

 .travis.yml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)