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

[nickm at torproject.org]

commit 85d78114563d00015ffec35a7d3c854c18707fec
Merge: 3aade2f da876ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 26 17:58:51 2011 -0500

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

 changes/timersub_bug |    7 +++++++
 src/common/compat.h  |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)