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

[nickm at torproject.org]

commit 7ac8a4a037581ab7c47079cc98c9d3496932a8bd
Merge: deaf30a 93b7301
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 16 11:50:53 2012 -0400

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

 changes/bug6397         |    4 ++++
 changes/cov709056       |    4 ++++
 src/or/circuitbuild.c   |   10 +++++-----
 src/tools/tor-gencert.c |    7 ++++++-
 4 files changed, 19 insertions(+), 6 deletions(-)