[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

commit 3363a0d26e553378084415b1bcc67c36929d9c07 Merge: f403781 a7a4bbf Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 27 16:39:30 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6251 | 6 ++++++ src/or/circuitbuild.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)