commit 8b6d0bd99cf233560f7e704a35e4f64a5271bfb1
Merge: 82fea1b 79cdf81
Author: Nick Mathewson <[email protected]>
Date: Fri Jun 14 01:45:46 2013 -0400
Merge branch 'circuit_queue_cap-0.2.4-squashed' into maint-0.2.4
changes/bug9063 | 3 +++
src/or/or.h | 9 +++++++++
src/or/relay.c | 28 +++++++++++++++++++++++++++-
3 files changed, 39 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
