[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma at torproject.org]

commit 01fdd676ea8f8ec494776163f07a5d28f48375b1
Merge: f0ba3c1 335ff91
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Jul 6 00:13:47 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug3465-022       |    6 ++++++
 changes/cid_428           |    5 +++++
 changes/cid_450           |    5 +++++
 changes/memleak_rendcache |    4 ++++
 doc/HACKING               |   22 +++++++++++++---------
 src/common/compat.c       |   18 +++++++++++++++---
 src/common/container.c    |    5 +++--
 src/or/circuitbuild.c     |   10 +++++-----
 src/or/circuitlist.c      |    2 +-
 src/or/connection.c       |   14 ++++++++++----
 src/or/control.c          |    3 ++-
 src/or/dirserv.c          |    2 +-
 src/or/or.h               |    6 +++---
 src/or/rendcommon.c       |    1 +
 src/test/Makefile.am      |    2 +-
 src/test/tinytest_demo.c  |    2 +-
 16 files changed, 76 insertions(+), 31 deletions(-)