commit 0061d428900946ce8bf5c8bfb4c2b3b5faa4f691
Merge: ad28397 f272ee6
Author: Nick Mathewson <[email protected]>
Date: Thu Feb 7 15:13:21 2013 -0500
Merge remote-tracking branch 'public/bug7816_024'
changes/bug7816.024 | 8 ++++++++
src/or/dirvote.c | 20 +++++++++++---------
src/or/router.c | 1 +
3 files changed, 20 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
