commit 815fc3504d44a72e1db1cf8724afae341f5c168e Merge: efa8e9c 3f69a22 Author: Jacob Appelbaum jacob@appelbaum.net Date: Sat May 18 15:09:24 2013 +0200

Merge branch 'master' into debian-master

.travis.yml | 2 +- AUTHORS | 1 + CHANGELOG | 1 + HACKING | 103 -------------------- HACKING.md | 108 +++++++++++++++++++++ HARDENING | 76 +++++++++++++++ INSTALL | 58 ++++++++++- Makefile.am | 6 +- README | 68 ++++--------- apparmor-profile | 2 + autogen.sh | 8 +- configure.ac | 130 ++++++++++++++++++++++++- m4/ax_platform.m4 | 46 +++++++-- man/tlsdated.1 | 70 -------------- man/tlsdated.8 | 70 ++++++++++++++ src/Makefile.am | 116 ---------------------- src/common/fmemopen-funopen.c | 158 ++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 ++ src/common/strnlen.c | 19 ++++ src/common/strnlen.h | 8 ++ src/compat/clock-hurd.c | 59 ++++++++++++ src/compat/clock.h | 12 ++- src/compat/include.am | 20 ++++ src/conf-unittest.c | 6 ++ src/conf.c | 10 +- src/include.am | 211 ++++++++++++++++++++++++++++++++++++++++- src/proxy-bio.c | 6 ++ src/proxy-polarssl.c | 6 ++ src/tlsdate-helper.c | 9 +- src/tlsdate-helper.h | 4 + src/tlsdated-unittest.c | 13 ++- src/util.h | 4 + 32 files changed, 1045 insertions(+), 373 deletions(-)