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

[ioerror at torproject.org]

commit 73147ed1dafe83caf6a9343ed169f34d9f704cae
Merge: a5687fa 004f6f6
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sat Nov 2 01:03:08 2013 +0100

    Merge branch 'master' into debian-master

 src/tlsdate.c |    2 --
 1 file changed, 2 deletions(-)