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

[nickm at torproject.org]

commit 9919b0127568253b6bec4f681db3cdc2b5978991
Merge: 64a5a41 2b5ebc7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 22 18:15:27 2011 -0400

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

 doc/HACKING              |   22 +++++++++++++---------
 src/common/compat.c      |    2 +-
 src/common/container.c   |    5 +++--
 src/or/connection.c      |    6 +++---
 src/or/or.h              |    6 +++---
 src/test/Makefile.am     |    2 +-
 src/test/tinytest_demo.c |    2 +-
 7 files changed, 25 insertions(+), 20 deletions(-)