commit 01184f164f027aa4e34a9f6b90c01120040f63cb
Merge: 36e2eb6 c8f5f35
Author: Nick Mathewson <[email protected]>
Date: Mon Feb 11 13:32:38 2013 -0500
Merge remote-tracking branch 'public/bug8158'
changes/bug8158 | 3 ++
src/or/dirserv.c | 34 +---------------------
src/or/dirvote.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/or/dirvote.h | 5 +++
4 files changed, 91 insertions(+), 32 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
