commit 72c651ebdd64d28e0bfe640e37979b84f524abad
Merge: 8b6a952 4cc7cc2
Author: Nick Mathewson <[email protected]>
Date: Tue Mar 26 22:20:08 2013 -0400
Merge branch 'bug7065_v2' into maint-0.2.4
changes/bug7065 | 5 +++++
src/or/circuitbuild.c | 28 ++++++++++++++--------------
src/or/routerparse.c | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
