[tor-commits] [tor/master] Merge branch 'bug5603'

[nickm@xxxxxxxxxxxxxx]

commit 7b2afb61b21d09bc3dfc015a18538bf2826e805c
Merge: d09a3ec 7cad2e7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 5 11:47:34 2012 -0400

    Merge branch 'bug5603'

 changes/bug5603       |    9 ++++++
 src/or/circuitbuild.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 4 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits