commit 2dcad03eba5ece3fa927623b41802a7ea11d95dd
Merge: 2c73fe5 cd4ad45
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 5 00:33:04 2013 -0500
Merge remote-tracking branch 'public/bug8151'
changes/bug8151 | 5 +++++
src/or/dirserv.c | 24 ++++++++++++++++++++++++
src/or/dirserv.h | 1 +
src/or/dirvote.c | 5 +++++
4 files changed, 35 insertions(+), 0 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
