commit 08b3ae69bc91f8c9d56d470d9d2b147ce77a526c Merge: bddd9e8 1eb63c3 Author: Jacob Appelbaum <jacob@appelbaum.net> Date: Thu Apr 18 20:04:52 2013 -0700 Merge branch 'master' of github.com:ioerror/tlsdate configure.ac | 19 +++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 ++ src/common/strnlen.c | 19 +++++ src/common/strnlen.h | 8 ++ src/conf-unittest.c | 6 ++ src/conf.c | 2 +- src/include.am | 20 +++++ src/proxy-bio.c | 6 ++ src/proxy-polarssl.c | 6 ++ src/tlsdate-helper.c | 2 +- 11 files changed, 245 insertions(+), 9 deletions(-)