commit cb065a55bd209b9c23bc14119c2403680b087885 Merge: cb28fe4 aae4ebf Author: Nick Mathewson <[email protected]> Date: Tue Feb 11 10:15:03 2014 -0500
Merge remote-tracking branch 'karsten/one-dirauth'
changes/bug10842 | 4 ++++
src/or/directory.c | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
