commit 6256c61d959dc2aa84752ac7903b827fffd53583 Merge: 424af93 19fb86a Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 24 10:18:00 2016 -0400

Merge branch 'timegm_overflow_squashed'

changes/bug18479 | 5 +++ src/common/util.c | 23 +++++++++-- src/test/test_util.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 133 insertions(+), 4 deletions(-)