commit 84f47ffc462dface8db1def322414daa43400d1c Merge: 1c30e6a 973c18b Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:14:43 2012 -0400

Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2

changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)