commit 36829539d64dab47e07bd619b7b833ef50d26853 Merge: 4e88a3b ff8aba7 Author: Roger Dingledine arma@torproject.org Date: Wed Sep 28 15:38:02 2011 -0400

Merge branch 'maint-0.2.2'

changes/bug4124 | 6 ++++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)