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

[nickm at torproject.org]

commit 734e860d98e1874dcd92e69051806e53205ee0b0
Merge: 0b53646 06f0c1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 1 12:56:40 2011 -0400

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

 changes/cid_428           |    5 +++++
 changes/cid_450           |    5 +++++
 changes/memleak_rendcache |    4 ++++
 src/common/compat.c       |   16 ++++++++++++++--
 src/or/connection.c       |    8 +++++++-
 src/or/dirserv.c          |    2 +-
 src/or/rendcommon.c       |    1 +
 7 files changed, 37 insertions(+), 4 deletions(-)