commit ea929e8456d065a25d7eb5e2e0e41e0f303ebe9d Merge: c2822bbc6 021fdd39e Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 09:59:46 2017 -0500

Merge remote-tracking branch 'public/feature24427'

changes/feature24427 | 5 +++++ configure.ac | 1 + src/common/compat_time.c | 15 +++++++++++++++ src/common/compat_time.h | 3 +++ 4 files changed, 24 insertions(+)