commit fac99f01dadc104db8ccaf7a24da2a57860b4165 Merge: 5ee5103 4126de6 Author: Nick Mathewson nickm@torproject.org Date: Tue May 3 21:54:18 2011 -0400

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

src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)