commit 7578606a2265466bc4546f0d08b9dbdf427e7c1c
Merge: c95cc08 71bd100
Author: Nick Mathewson <[email protected]>
Date: Fri Oct 25 12:15:31 2013 -0400
Merge remote-tracking branch 'public/bug9934_nm'
changes/bug9934 | 4 ++++
src/or/control.c | 27 +++++++++++++++++++++++++++
src/or/entrynodes.c | 19 +++++++++++++++++++
src/or/entrynodes.h | 2 ++
4 files changed, 52 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
