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

[ioerror at torproject.org]

commit ce0b3ddd585a8da2648820886dfe64a52c72631c
Merge: 6138ec9 c902f51
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Mon Apr 15 19:54:36 2013 -0700

    Merge branch 'master' into debian-master

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