commit d7ed50929949dead066a8a482accc770c8b61e26 Merge: e0c408e 232fa7e Author: Jacob Appelbaum jacob@appelbaum.net Date: Fri Nov 1 03:11:36 2013 +0100

Merge branch 'master' into debian-master

src/routeup.c | 1 + src/test-bio.c | 1 + src/tlsdate-helper.c | 54 ++++++++++++++++++++++++++------------------------ src/tlsdate-helper.h | 1 + src/tlsdate.c | 8 +++++--- src/tlsdate.h | 1 + src/util-plan9.h | 1 + src/util.c | 16 ++++++++++++++- src/util.h | 2 ++ 9 files changed, 55 insertions(+), 30 deletions(-)