[tor-commits] [tor/master] Merge branch 'bug7014_023_squashed' into maint-0.2.3

[nickm at torproject.org]

commit e2549c3b745313d6647c7e1d05025a84e1d33873
Merge: 0a3dfd0 721f99e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 9 23:46:56 2012 -0400

    Merge branch 'bug7014_023_squashed' into maint-0.2.3

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