commit 57db578b814ec0c036048135943da9942b72953d Merge: 842a7a8 fbf1c5e Author: Roger Dingledine arma@torproject.org Date: Sun Nov 27 03:33:11 2011 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- src/or/dirserv.c | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-)