commit 63a42b38b1ea6c9f1899c6a600363a332d438597 Merge: 66d52b8 0120689 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 20 10:53:07 2013 -0400

Merge remote-tracking branch 'public/unsigned-time_t'

changes/warn-unsigned-time_t | 6 ++++++ src/or/microdesc.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-)