commit c1005dd6d34a40080af478ef4cb85860d04f3844 Merge: d029c32 9725646 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 13:24:46 2011 -0400

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

changes/bug4383 | 5 +++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)