commit 7cb804343b827ce048c2468d16f6887238790241
Merge: 782b7f4 d0ed7cb
Author: Nick Mathewson <[email protected]>
Date: Thu Dec 22 10:51:39 2011 -0500
Merge remote-tracking branch 'rransom/feature2411-v4'
changes/feature2411 | 12 ++++
src/or/circuitlist.c | 57 ++++++++++++++++++++
src/or/circuitlist.h | 1 +
src/or/control.c | 142 ++++++++++++++++++++++++++++++++++++++-----------
4 files changed, 180 insertions(+), 32 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
