commit 0cbe3ff313deb6ef7807b07f922a567e8e1274bd
Merge: dff73d2 b7e863c
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu May 31 17:00:37 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug5283 | 6 ++++++
src/or/circuituse.c | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletions(-)