commit ce042c6f3e561ddef111119692c0307380ac886b Merge: 7ba9ae2 26e983f Author: Jacob Appelbaum jacob@appelbaum.net Date: Sun Jun 30 05:53:06 2013 +0200

Merge branch 'master' of github.com:ioerror/tlsdate

CHANGELOG | 1 + etc/tlsdated.conf | 3 +- man/tlsdated.conf.5 | 6 ++-- src/tlsdate.h | 6 ++-- src/tlsdated-unittest.c | 14 +++------ src/tlsdated.c | 77 ++++++++++++++++++----------------------------- src/util.c | 31 +++++++++++++++++++ src/util.h | 4 +++ 8 files changed, 75 insertions(+), 67 deletions(-)