[tor-commits] [tlsdate/master] Merge pull request #114 from elly/refactor

[ioerror at torproject.org]

commit 26e983f1cfc58152bb17893d024929f1dfa39de9
Merge: 3f69a22 691a39f
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Mon Jun 24 11:34:32 2013 -0700

    Merge pull request #114 from elly/refactor
    
    Fix subprocess watching.

 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(-)