commit 4d87919ba649790a2a6c446d112dd2a8ad34862d Merge: d7a646e acfd487 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 4 18:34:39 2012 -0400

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

changes/bug6743 | 9 +++++++++ src/or/circuituse.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)