commit 8d3f412cdace9bec7883152735103ffedbd8ad65 Merge: 8698765 1d91bf5 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 23 08:06:25 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

src/common/compat_time.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)