commit 1d91bf57dfe83a7976d8cf7e5e6a6acfae94d022 Merge: 490cd03 a757f76 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 23 08:06:11 2016 -0500

Merge branch 'bug21035' into maint-0.2.9

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