commit fffc59b0e941f12e1588e0604c8295ecc0679150
Merge: f0bce2d 8f16a77
Author: Nick Mathewson <[email protected]>
Date: Tue Apr 8 12:06:03 2014 -0400
Merge remote-tracking branch 'public/bug9841_025'
changes/bug9841 | 7 ++
src/or/circuitlist.c | 164 ++++++++++++++++++++++++++++++++++++++-----
src/or/circuitlist.h | 6 +-
src/or/or.h | 33 +++++----
src/or/rendmid.c | 14 ++--
src/test/test_circuitlist.c | 90 ++++++++++++++++++++++++
6 files changed, 275 insertions(+), 39 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
