commit a4669d8704af7e9d978cb392e6a8df79376207b3
Merge: 274e281 a74d418
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Aug 17 12:10:44 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug6475 | 6 ++
src/or/circuitbuild.c | 236 ++++++++++++++++++++++++++++++++++++++++++-------
src/or/or.h | 21 +++++
3 files changed, 229 insertions(+), 34 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
