commit f40378118c711da6bf6d3ee2f247189306abad22
Merge: 2776a6b 0c13547
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Aug 27 16:23:19 2012 -0400
Merge remote-tracking branch 'mikeperry/bug6647'
changes/bug6647 | 7 +++++
src/or/circuitbuild.c | 59 +++++++++++++++++++++++++++++++++++++-----------
2 files changed, 52 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
