[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 8b33928676bdf751010e5d660e6e6cca9a152389
Merge: 88638d4 2dc9546
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 17:15:31 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/gmtime_null |    6 +++
 src/common/compat.c |  112 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/common/compat.h |    9 ----
 3 files changed, 103 insertions(+), 24 deletions(-)