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

[ioerror at torproject.org]

commit 5b38f7e594fd0f5bf76eccb75efe5b1a6a1d0c8e
Merge: d7ed509 e33b895
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sat Nov 2 00:49:42 2013 +0100

    Merge branch 'master' into debian-master

 CHANGELOG    |    3 ++-
 README       |   20 +++-----------------
 configure.ac |    2 +-
 3 files changed, 6 insertions(+), 19 deletions(-)